q-koa 13.8.55 → 13.8.56

package/core/app.js

@@ -8,7 +8,6 @@ const Sequelize = require('sequelize')
 const redis = require('redis')
 const moment = require('moment')
 const { EventEmitter } = require('events')
-const nodeVm = require('vm')
 const { LRUCache } = require('lru-cache')
 const axios = require('axios')
 
@@ -67,7 +66,7 @@ const starter = new EventEmitter()
 const formatPostFunction = (str) => `eval(${str})`
 
 const runVm = (_str) => {
-  return nodeVm.runInNewContext(_str)
+  return new Function(`return ${_str}`)()
 }
 
 const getLiteral = (str) => {

package/core/file/plugins/system/controller.js

@@ -550,106 +550,6 @@ exports.initDataWithCache = exports.initData = async (ctx) => {
   return ctx.SUCCESS(result)
 }
 
-exports.recentlyError = async (ctx) => {
-  // const {
-  //   app,
-  //   appName,
-  // } = getAppByCtx(ctx);
-
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ctx.app.on('error', async (err) => {
-      console.log(err)
-      try {
-        send({
-          type: 'error',
-          payload: err ? err.errorData : {},
-        })
-      } catch (e) {
-        console.log(e)
-      }
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
-exports.sandbox = async (ctx) => {
-  const code = `
-          module.exports = async (callback)=>{
-              callback({
-                name:1
-              })
-          }
-      `
-  // const { code } = ctx.request.body;
-  const vm = new VM({
-    sandbox: {
-      axios,
-      module,
-      setTimeout,
-      sleep: (time) =>
-        new Promise((resolve) => setTimeout(resolve, time * 1000)),
-    },
-  })
-  vm.run(code)(ctx.SUCCESS)
-}
-
-exports.onlineChat = async (ctx) => {
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ws.on('message', async (code) => {
-      const vm = new VM({
-        sandbox: {
-          send: (data) => ws.send(JSON.stringify(data)),
-          axios,
-        },
-      })
-      vm.run(code)
-      const unhandledRejections = {}
-
-      process.on('unhandledRejection', (reason) => {
-        if (unhandledRejections[reason]) {
-          console.log('====?', reason)
-        } else {
-          send({
-            type: 'error',
-            payload: `${reason}`,
-          })
-          unhandledRejections[reason] = true
-        }
-      })
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
-exports.chat = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
-  if (ctx.ws) {
-    const ws = await ctx.ws()
-    const send = (data) => ws.send(JSON.stringify(data))
-    ws.on('message', async (payload) => {
-      const message = JSON.parse(payload)
-      const result = await app.model.ask.create({
-        user_id: message.payload.user_id,
-        content: message.payload.content,
-        is_ask: Boolean(message.payload.user_id),
-      })
-
-      send({
-        type: 'message',
-        payload: result,
-      })
-    })
-  } else {
-    throw new Error('这是一个websocket url')
-  }
-}
-
 exports.showModelCount = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { is_count = false } = ctx.request.body

package/core/file/plugins/system/service.js

@@ -2,10 +2,9 @@ const lodash = require('lodash')
 const { Sequelize } = require('q-koa')
 const { formatLiteralObj, filterFunction } = require('../../utils')
 const formatPostFunction = (str) => `eval(${str})`
-const nodeVm = require('vm')
 const axios = require('axios')
 const runVm = (_str) => {
-  return nodeVm.runInNewContext(_str)
+  return new Function(`return ${_str}`)()
 }
 
 const memRunVm = lodash.memoize(runVm)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.55",
+  "version": "13.8.56",
   "description": "",
   "main": "index.js",
   "scripts": {