whistle.script 1.2.2 → 1.2.6

package/lib/util.js

@@ -2,6 +2,7 @@ const zlib = require('zlib');
 const { EventEmitter } = require('events');
 const { parse: parseUrl } = require('url');
 const http = require('http');
+const https = require('https');
 const dataSource = require('./dataSource');
 
 exports.AUTH_URL = 'x-whistle-.script-auth-url';
@@ -14,7 +15,7 @@ exports.noop = () => {};
 
 const POLICY = 'x-whistle-.script-policy';
 const isFunction = fn => typeof fn === 'function';
-const URL_RE = /^http:(?:\/\/|%3A%2F%2F)[\w.-]/;
+const URL_RE = /^https?:(?:\/\/|%3A%2F%2F)[\w.-]/;
 
 exports.isFunction = isFunction;
 exports.noop = () => {};
@@ -141,7 +142,9 @@ const request = (url, headers, data) => {
     options.method = 'POST';
   }
   return new Promise((resolve, reject) => {
-    const client = http.request(options, (res) => {
+    const httpModule = options.protocol === 'https:' ? https : http;
+    options.rejectUnauthorized = false;
+    const client = httpModule.request(options, (res) => {
       res.on('error', handleError);  // eslint-disable-line
       let body;
       res.on('data', (chunk) => {

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.2",
+  "version": "1.2.6",
   "author": "avenwu <avenwu@vip.qq.com>",
   "contributors": [],
   "license": "MIT",
@@ -15,6 +15,9 @@
     "ssi"
   ],
   "registry": "https://github.com/whistle-plugins/whistle.script",
+  "whistleConfig": {
+    "pluginVars": true
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/whistle-plugins/whistle.script.git"

package/rules.txt

@@ -1,2 +1,2 @@
-* whistle.script:// includeFilter://reqH.x-whistle-.script-policy=remote
-* sniCallback://script includeFilter://reqH.x-whistle-.script-policy=sni
+* whistle.script:// delete://reqH.x-whistle-.script-policy|reqH.x-whistle-.script-auth-url|reqH.x-whistle-.script-req-rules-url|reqH.x-whistle-.script-res-rules-url|reqH.x-whistle-.script-stats-url|reqH.x-whistle-.script-data-url includeFilter://reqH.x-whistle-.script-policy=remote
+* sniCallback://script delete://reqH.x-whistle-.script-policy|reqH.x-whistle-.script-sni-url includeFilter://reqH.x-whistle-.script-policy=sni