修改注入请求判断

ndcc/server/lib/basic.js

@@ -5,12 +5,13 @@ const Cookies = require('cookies');
 
 module.exports = class{
 
-  constructor(request,server,inject) {
-    this.inject = inject;
+  constructor(request,server) {
+    this.isInjected = request.isInjected;  // 是否是server.inject创建的
     this.server = server;
     this.request = request;
     this.plugins = server.settings.app.plugins;
-    let {cache,info,headers,url,mongo,userType,auth,route,query,payload,params,method,socket} = inject ? inject.request : request;
+    const getRequest = this.isInjected ? request.plugins.request : request;    //获取注入请求
+    let {cache,info,headers,url,mongo,userType,auth,route,query,payload,params,method,socket} = getRequest;
     const {referrer,host,hostname,received,id} = info;
     const {req,res} = request.raw;
     const xFF = headers['x-forwarded-for'];
@@ -22,7 +23,7 @@ module.exports = class{
     
     this.ctx = {
       plugins:route.settings.plugins || {},  //替换为注入插件
-      db:(collection,options={})=>mongodb(inject ? inject.request : request,collection,options),
+      db:(collection,options={})=>mongodb(getRequest,collection,options),
       user:!_.isEmpty(user) ? {_id:user._id,name:user.username,source:user.source} : user,
       cache,
       id:ToBase64(id),
@@ -134,7 +135,7 @@ module.exports = class{
           payload:this.getPayload()
         }
       };
-      return this.inject ? this.raw : await this.loadPlugins(this.raw);
+      return this.isInjected ? this.raw : await this.loadPlugins(this.raw);
     }catch (e){
       Error(e,'init');
     }

ndcc/server/plugins/route.js

@@ -34,7 +34,7 @@ exports.plugin  = {
             return async (request,h)=>{
                 try {
                     request.raw.req.url = `/api/plugins/${_id}`;
-                    const {req,res} = await new Basic(request,server,request.plugins).init();
+                    const {req,res} = await new Basic(request,server).init();
                     await handler(req,res);
                     return h.close;
                 } catch (e) {

ndcc/server/plugins/socket.js

@@ -94,15 +94,21 @@ exports.plugin  = {
                                 socket.emit(callback_id,output)
                             }
                         });
-                        // socket.on('post',async (payload)=>{
-                        //     const result = await server.inject({url:"/socket/auth",method:"POST",
-                        //         payload,
-                        //         plugins:{
-                        //             request
-                        //         }
-                        //     });
-                        //     // console.log(result,'====')
-                        // })
+                        socket.on('post',async (options)=>{
+                            const {data,url,callback_id} = options;
+
+                            //需要处理判断注入请求不需要走权限~~，然后request获取注入请求的request,接娃回来写
+                            const res = await server.inject({url,method:"POST",
+                                payload:data,
+                                headers:socket.request.headers,
+                                plugins:{request}
+                            });
+                            if(res.statusMessage !== "OK"){
+                                socket.emit(callback_id,res.result)
+                            }else{
+                                console.log(res,'======')
+                            }
+                        })
                     }
                 });
                 item.settings.plugins['socket'].io = io

src/pages/api/plugins/Zi34RUP5T5YuGLrJ.js

@@ -3,7 +3,6 @@
 export default async (req)=>{ 
     const {send,reply,error,isGet,db,cookie,event,socket} = await req.ctx();  
     try{ 
-        error('fsdf')
         send(await db('test').findOne())  
     }catch (e){
         error(e)

src/pages/api/routes/ZizW9ckSRyqCIpyG.js

@@ -1,8 +1,8 @@
 
 export default async (req)=>{ 
-    const {send,error} = await req.ctx();  
+    const {send,error,db} = await req.ctx();  
     try{
-        send('Hello World!dsdwsdfsddfff11111');
+        send(await db('test').findOne());
     }catch (e){ 
         error(e)
     }

src/pages/web/ZhkJRJZe81m1AB-0/index.js

@@ -6,14 +6,19 @@ export default function App(props) {
     const start = async () => {
          
         const socket = io.connect('http://localhost:3000', {
-            path:"/api/ZhIWjVHdVLru7eFn",
+            path:"/ZhkJRJZe81m1AB-0",
             transports: ['websocket'] 
         });
-        socket.on("testSocket", (value) => {
+        socket.on("testPost", (value) => {
             console.log(value)
         });
-
-        // socket.emit('post',{name:'testPost'})
+        socket.emit("post",{
+            url:"/api/ZizW9ckSRyqCIpyG",
+            callback_id:'testPost',
+            data:{
+                name:'testPost'
+            }
+        });