@kineticdata/react 5.0.15 → 5.0.18

package/lib/components/task/triggers/TriggerTable.js

@@ -1,4 +1,4 @@
-import { fetchTaskTriggers, fetchSources } from '../../../apis/task';
+import { fetchTaskTriggers, fetchSources } from '../../../apis';
 import { generateTable } from '../../table/Table';
 import { get } from 'immutable';
 
@@ -33,7 +33,8 @@ var dataSource = function dataSource(_ref) {
     transform: function transform(result) {
       return {
         data: result.triggers,
-        nextPageToken: result.nextPageToken
+        nextPageToken: result.nextPageToken,
+        count: result.count
       };
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kineticdata/react",
-  "version": "5.0.15",
+  "version": "5.0.18",
   "description": "A React library for the Kinetic Platform",
   "main": "lib/index.js",
   "main:src": "src/index.js",
@@ -33,7 +33,7 @@
     "lodash.isstring": "^4.0.1",
     "modularscale-sass": "^3.0.8",
     "moment": "^2.21.0",
-    "prismjs": "1.17.0",
+    "prismjs": "1.23.0",
     "prop-types": "^15.7.2",
     "react-autosuggest": "^9.4.3",
     "react-avatar": "^3.5.0",
@@ -92,5 +92,5 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "gitHead": "c2406bd024de982e1fec2e971643f4283dbfa29f"
+  "gitHead": "4af3c0d37633d85f65119ab5a2d2410f72128bda"
 }

package/proxyhelper.js

@@ -1,26 +1,99 @@
 const removeSecure = cookie => cookie.replace(/;\s*Secure/i, '');
 const removeSameSiteNone = cookie => cookie.replace(/;\s*SameSite=None/i, '');
 
-module.exports = (target = process.env.REACT_APP_PROXY_HOST) => ({
+const getProxyData = request => ({
+  host: request.socket._host,
+  scheme: request.agent.protocol.replace(':', ''),
+  method: request.method,
+  path: request.path,
+});
+
+const getRequestData = request => ({
+  host: request.headers.host,
+  scheme: request.headers['x-forwarded-proto'],
+  method: request.method,
+  path: request.url,
+});
+
+const getResponseData = response => ({
+  statusCode: response.statusCode,
+  message: response.message,
+  host: response.socket.servername,
+});
+
+const defaultProxyLogger = ({
+  proxyRequest,
+  originalRequest,
+  proxyResponse,
+}) => {
+  try {
+    if (proxyRequest) {
+      const proxyData = getProxyData(proxyRequest);
+      const originalData = getRequestData(originalRequest);
+      console.log(
+        `[proxy] [original] -> ${originalData.method}\t${
+          originalData.scheme
+        }\t${originalData.host}\t${originalData.path}`,
+      );
+      console.log(
+        `[proxy] [proxied]  -> ${proxyData.method}\t${proxyData.scheme}\t${
+          proxyData.host
+        }\t${proxyData.path}`,
+      );
+    } else if (proxyResponse) {
+      const responseData = getResponseData(proxyResponse);
+      const requestData = getRequestData(originalRequest);
+      console.log(
+        `[proxy] [original] <- ${responseData.statusCode}\t${
+          requestData.method
+        }\t${requestData.scheme}\t${requestData.host} (${responseData.host})\t${
+          requestData.path
+        }`,
+      );
+    }
+  } catch (e) {
+    console.warn(
+      '[proxy] There was a problem logging proxy request/response information',
+      e,
+    );
+  }
+};
+
+module.exports = (
+  target = process.env.REACT_APP_PROXY_HOST,
+  { proxyLogger } = {},
+) => ({
   target,
   secure: true,
   changeOrigin: true,
   ws: true,
   xfwd: true,
-  onProxyReq: proxyReq => {
+  onProxyReq: (proxyRequest, originalRequest) => {
+    if (process.env.PROXY_DEBUGGING)
+      (proxyLogger || defaultProxyLogger)({
+        proxyRequest,
+        originalRequest,
+      });
+
     // Browsers may send Origin headers even with same-origin
     // requests. To prevent CORS issues, we have to change
     // the Origin to match the target URL.
-    if (proxyReq.getHeader('origin')) {
-      proxyReq.setHeader('origin', target);
+    if (proxyRequest.getHeader('origin')) {
+      proxyRequest.setHeader('origin', target);
     }
   },
-  onProxyRes: (proxyRes, req, res) => {
-    const setCookie = proxyRes.headers['set-cookie'];
-    if (setCookie && req.protocol === 'http') {
-      proxyRes.headers['set-cookie'] = Array.isArray(setCookie)
+  onProxyRes: (proxyResponse, originalRequest) => {
+    if (process.env.PROXY_DEBUGGING)
+      (proxyLogger || defaultProxyLogger)({
+        proxyResponse,
+        originalRequest,
+      });
+
+    const setCookie = proxyResponse.headers['set-cookie'];
+    if (setCookie && originalRequest.protocol === 'http') {
+      proxyResponse.headers['set-cookie'] = Array.isArray(setCookie)
         ? setCookie.map(removeSecure).map(removeSameSiteNone)
         : removeSameSiteNone(removeSecure(setCookie));
     }
   },
-});
+});