chore: refact

npmstudy · Nov 30, 2023 · ec91697 · ec91697
1 parent 73a0f55
commit ec91697
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 11 deletions.
diff --git a/packages/core/src/__tests__/app.test.ts b/packages/core/src/__tests__/app.test.ts
@@ -31,6 +31,12 @@ describe('app', async () => {
     return `${this.path} , ${a} `;
   });
 
+  rpc.add({
+    '/add': function (a: string, b: string) {
+      return { a: a };
+    },
+  });
+
   const request = supertest(rpc.callback());
 
   it('should access /a', async () => {
@@ -40,6 +46,13 @@ describe('app', async () => {
     expect(res.body).toEqual({ a: 'hello' });
   });
 
+  it('should access /add', async () => {
+    const res = await request.get('/api/add?$p=["hello"]');
+    expect(res.type).toEqual('application/json');
+    expect(res.status).toEqual(200);
+    expect(res.body).toEqual({ a: 'hello' });
+  });
+
   it('should access GET /b', async () => {
     const res = await request.get('/api/b?$p=["hello1"]');
     expect(res.type).toEqual('application/json');

diff --git a/packages/core/src/__tests__/fn.test.ts b/packages/core/src/__tests__/fn.test.ts
@@ -1,5 +1,6 @@
+import Koa from 'koa';
 import supertest from 'supertest';
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 
 // import { TestProxy, TestProxy2 } from '../../proxy';
 import { Fn } from '../index';
@@ -42,6 +43,19 @@ describe('app', async () => {
     expect(2).to.equal(count);
   });
 
+  it('use default response', async () => {
+    const fn = new Fn({ prefix: '/apk' });
+    const app = new Koa();
+
+    app.use(fn.default());
+    const request = supertest(app.callback());
+
+    const res = await request.get('/');
+    expect(res.type).toEqual('text/plain');
+    expect(res.status).toEqual(200);
+    expect(res.text).toEqual('[fn plugin] no fn repsonse, please check your fn if exist');
+  });
+
   it('use fn add a function', async () => {
     const fn = new Fn({ prefix: '/apk' });
 
@@ -56,4 +70,75 @@ describe('app', async () => {
     expect(res.status).toEqual(200);
     expect(res.body).toEqual({ a: 'hello' });
   });
+
+  // it('use fn add a  function', async () => {
+  //   const fn = new Fn({ prefix: '/apk' });
+
+  //   fn.fn('/postAbc', function (a) {
+  //     return { a: a };
+  //   });
+
+  //   const request = supertest(fn.app.callback());
+
+  //   const res = await request.post('/postAbc').send(['hello']).set('Accept', 'application/json');
+
+  //   console.dir(res);
+
+  //   expect(res.type).toEqual('application/json');
+  //   expect(res.status).toEqual(200);
+  //   expect(res.body).toEqual({ a: 'hello' });
+  // });
+
+  it('use fn add a lock function', async () => {
+    const fn = new Fn({ prefix: '/apk' });
+
+    fn.fn('/getAbc', function (a) {
+      return { a: a };
+    });
+    fn.fn('/Abclock', function (a) {
+      return { a: a };
+    });
+
+    const request = supertest(fn.app.callback());
+
+    const res = await request.get('/Abclock?$p=["hello"]');
+
+    expect(res.type).toEqual('text/plain');
+    expect(res.status).toEqual(200);
+    expect(res.text).toEqual('process fn:Abclock , you need send lock request from client');
+  });
+
+  it('use fn add two function with the same path', async () => {
+    const spy = vi.spyOn(console, 'log');
+    const fn = new Fn({ prefix: '/apk' });
+
+    fn.fn('/a', function (a) {
+      return { a: a };
+    });
+
+    fn.add({
+      '/a': function (a: string, b: string) {
+        return `${this.path} , ${a} c2 ${b}`;
+      },
+    });
+
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('use fn add arrow function', async () => {
+    const spy = vi.spyOn(console, 'log');
+    const fn = new Fn({ prefix: '/apk' });
+
+    fn.fn('/a', (a) => {
+      return { a: a };
+    });
+
+    fn.add({
+      '/a': (a: string, b: string, ctx) => {
+        return `${ctx.path} , ${a} c2 ${b}`;
+      },
+    });
+
+    expect(spy).toHaveBeenCalled();
+  });
 });
diff --git a/packages/core/src/__tests__/proxy.test.ts b/packages/core/src/__tests__/proxy.test.ts
@@ -3,7 +3,7 @@ import supertest from 'supertest';
 import { describe, expect, it, vi } from 'vitest';
 
 import { TestProxy, TestProxy2 } from '../../proxy';
-import { createServer, Proxy } from '../index';
+import { createServer, Proxy, combine } from '../index';
 
 describe('proxy', async () => {
   it('should enable proxy1', async () => {
@@ -62,7 +62,7 @@ describe('proxy', async () => {
     const tp = new Proxy({});
     tp.app.use(tp.proxy());
 
-    tp.app.use(async (ctx) => {
+    tp.use(async (ctx) => {
       ctx.body = { a: 'a' };
     });
 
@@ -73,4 +73,40 @@ describe('proxy', async () => {
     expect(res.status).toEqual(200);
     expect(res.body).toEqual({ a: 'a' });
   });
+
+  it('should enable proxy2', async () => {
+    const tp = new Proxy({});
+    // tp.app.use(tp.proxy());
+
+    tp.addInit(async (ctx) => {
+      ctx.body = { a: 'a' };
+    });
+
+    tp.app.use(combine(tp.init));
+
+    const request = supertest(tp.app.callback());
+
+    const res = await request.get('/');
+    expect(res.type).toEqual('application/json');
+    expect(res.status).toEqual(200);
+    expect(res.body).toEqual({ a: 'a' });
+  });
+
+  it('should enable proxy2', async () => {
+    const tp = new Proxy({});
+    tp.app.use(tp.proxy());
+
+    tp.addLoad(async (ctx) => {
+      ctx.body = { a: 'a' };
+    });
+
+    tp.app.use(combine(tp.load));
+
+    const request = supertest(tp.app.callback());
+
+    const res = await request.get('/');
+    expect(res.type).toEqual('application/json');
+    expect(res.status).toEqual(200);
+    expect(res.body).toEqual({ a: 'a' });
+  });
 });
diff --git a/packages/core/src/fn.ts b/packages/core/src/fn.ts
@@ -98,6 +98,8 @@ export class Fn extends Plugable {
 
       const lastKey = key.split('.').pop();
       const httpMethods = getHttpMethods();
+      console.dir('lastKey');
+      console.dir(lastKey);
 
       const supportMethods = [];
       httpMethods.forEach(function (m) {
@@ -108,11 +110,15 @@ export class Fn extends Plugable {
         }
       });
 
+      console.dir('supportMethods');
+      console.dir(ctx.method);
+      console.dir(supportMethods);
+
       if (supportMethods.length === 0) {
         log(ctx.path + ',没有匹配到包含get/post等开头的函数');
         await next();
-      } else if (ctx.method === supportMethods[0]) {
-        log('匹配到包含get/post等方法的函数');
+      } else if (ctx.method.toLowerCase() === supportMethods[0]) {
+        console.log('匹配到包含get/post等方法的函数');
         await next();
       } else {
         log('匹配到包含get/post等方法的函数，但method不对');

diff --git a/packages/core/src/plugin.ts b/packages/core/src/plugin.ts
@@ -56,12 +56,7 @@ export class Plugable implements Strategy {
     // load can before mount
     this.load.push(this.getMiddleware());
   }
-  /**
-   * ?
-   */
-  getConfig(ctx) {
-    return ctx[this.name];
-  }
+
   /**
    * move middleware to load stage, use template pattern & compose
    */