whistle.script 1.2.5 → 1.2.8

package/lib/util.js

@@ -13,6 +13,7 @@ exports.STATS_URL = 'x-whistle-.script-stats-url';
 exports.DATA_URL = 'x-whistle-.script-data-url';
 exports.noop = () => {};
 
+const PREFIX_LEN = 'x-whistle-.script-'.length;
 const POLICY = 'x-whistle-.script-policy';
 const isFunction = fn => typeof fn === 'function';
 const URL_RE = /^https?:(?:\/\/|%3A%2F%2F)[\w.-]/;
@@ -140,6 +141,7 @@ const request = (url, headers, data) => {
   if (data) {
     data = Buffer.from(JSON.stringify(data));
     options.method = 'POST';
+    options.headers['content-type'] = 'application/json';
   }
   return new Promise((resolve, reject) => {
     const httpModule = options.protocol === 'https:' ? https : http;
@@ -181,11 +183,12 @@ exports.request = async (url, headers, data) => {
   }
 };
 
-const hasPolicy = ({ headers }, name) => {
+const hasPolicy = ({ headers, originalReq: { ruleValue } }, name) => {
   const policy = headers[POLICY];
   if (typeof policy === 'string') {
     return policy.toLowerCase().indexOf(name) !== -1;
   }
+  return ruleValue === `policy=${name}`;
 };
 
 const isRemote = (req) => {
@@ -198,12 +201,32 @@ exports.isSni = (req) => {
   return hasPolicy(req, 'sni');
 };
 
+const getValue = ({ originalReq: req }, name) => {
+  const { pluginVars, globalPluginVars } = req;
+  const vars = globalPluginVars ? pluginVars.concat(globalPluginVars) : pluginVars;
+  const len = vars && vars.length;
+  if (!len) {
+    return;
+  }
+  for (let i = 0; i < len; i++) {
+    const item = vars[i];
+    const index = item.indexOf('=');
+    if (index !== -1 && item.substring(0, index) === name) {
+      return item.substring(index + 1);
+    }
+  }
+};
+
+const getVarName = (name) => name.substring(PREFIX_LEN).replace(/-(.)/g, (_, ch) => ch.toUpperCase());
+
 exports.getRemoteUrl = (req, name) => {
   let url = req.headers[name];
-  if (typeof url === 'string') {
+  if (url && typeof url === 'string') {
     url = decodeURIComponent(url);
-    if (URL_RE.test(url)) {
-      return url;
-    }
+  } else {
+    url = getValue(req, getVarName(name));
+  }
+  if (URL_RE.test(url)) {
+    return url;
   }
 };

package/lib/wsServer.js

@@ -3,6 +3,17 @@ const iconv = require('iconv-lite');
 const { getDataSource, getFn } = require('./util');
 const scripts = require('./scripts');
 
+const toBuffer = (data) => {
+  if (Buffer.isBuffer(data)) {
+    return data;
+  }
+  if (data == null) {
+    data = '';
+  } else if (typeof data !== 'string') {
+    data = JSON.stringify(data);
+  }
+  return data && Buffer.from(data);
+};
 
 module.exports = (server, options) => {
   const { getReceiver, getSender } = options.wsParser;
@@ -18,7 +29,13 @@ module.exports = (server, options) => {
       err.code = code;
       socket.emit('error', err);
     };
-    socket.send = sender.send.bind(sender);
+    socket.send = (data, opts, cb) => {
+      try {
+        return sender.send(toBuffer(data), opts, cb);
+      } catch (e) {
+        socket.emit('error', e);
+      }
+    };
     socket.ping = sender.ping.bind(sender);
     socket.pong = sender.pong.bind(sender);
     socket.disconnect = sender.close.bind(sender);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whistle.script",
   "description": "The plugin for the extension script for whistle",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "author": "avenwu <avenwu@vip.qq.com>",
   "contributors": [],
   "license": "MIT",
@@ -16,6 +16,7 @@
   ],
   "registry": "https://github.com/whistle-plugins/whistle.script",
   "whistleConfig": {
+    "priority": 999999999,
     "pluginVars": true
   },
   "repository": {