Merge pull request #892 from CarnegieLearningWeb/bugfix/node-bundler-v4

Bugfix/node bundler v4

clientlibs/js/package.json

@@ -1,14 +1,14 @@
 {
   "name": "upgrade_client_lib",
-  "version": "4.1.0",
+  "version": "4.1.6",
   "description": "Client library to communicate with the Upgrade server",
-  "main": "dist/bundle.js",
-  "types": "dist/clientlibs/js/src/index.d.ts",
   "files": [
     "dist/*"
   ],
   "scripts": {
-    "build": "npm run clean && webpack",
+    "build:bundler": "webpack",
+    "build:types": "./node_modules/.bin/dts-bundle-generator -o dist/browser/index.d.ts src/index.ts && ./node_modules/.bin/dts-bundle-generator -o dist/node/index.d.ts src/index.ts",
+    "build": "npm run clean && npm run build:bundler && npm run build:types",
     "build:watch": "tsc -w",
     "clean": "rm -rf dist",
     "lint": "eslint -c ../../.eslintrc.js --ext .ts './{src, test}/**/*.ts' && npm run prettier:check",
@@ -25,6 +25,7 @@
     "@types/jest": "^29.2.1",
     "@types/node": "^18.11.9",
     "@types/uuid": "^9.0.1",
+    "dts-bundle-generator": "^8.0.1",
     "jest": "^29.2.2",
     "ts-jest": "^29.0.3",
     "ts-loader": "^9.4.1",
@@ -35,8 +36,8 @@
     "webpack-cli": "^4.10.0"
   },
   "dependencies": {
+    "axios": "^1.4.0",
     "es6-promise": "^4.2.8",
-    "isomorphic-fetch": "^3.0.0",
     "uuid": "^8.3.2"
   }
 }

clientlibs/js/src/common/fetchDataService.ts

@@ -1,5 +1,5 @@
 import { Interfaces, Types } from '../identifiers';
-import * as fetch from 'isomorphic-fetch';
+import axios, { AxiosRequestConfig } from 'axios';
 import * as uuid from 'uuid';
 
 // Call this function with url and data which is used in body of request
@@ -44,28 +44,45 @@ async function fetchData(
       ? (headers = { ...headers, 'Client-source': 'Browser' })
       : (headers = { ...headers, 'Client-source': 'Node' });
 
-    let options: Interfaces.IRequestOptions = {
+    let options: AxiosRequestConfig = {
       headers,
       method: requestType,
-      keepalive: sendAsAnalytics,
     };
 
+    if (
+      typeof window === 'undefined' &&
+      typeof process !== 'undefined' &&
+      process.release &&
+      process.release.name === 'node'
+    ) {
+      if (sendAsAnalytics) {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const http = require('http');
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const https = require('https');
+        options.httpAgent = new http.Agent({ keepAlive: true });
+        options.httpsAgent = new https.Agent({ keepAlive: true });
+      }
+    }
+
     if (requestType === Types.REQUEST_TYPES.POST || requestType === Types.REQUEST_TYPES.PATCH) {
       options = {
         ...options,
-        body: JSON.stringify(data),
+        data,
       };
     }
 
-    const response = await fetch(url, options as RequestInit);
-    const responseData = await response.json();
-    // If value of ok is false then it's error
-    if (response.ok) {
-      return {
-        status: true,
-        data: responseData,
-      };
-    } else {
+    const response = await axios({
+      url,
+      ...options,
+    }).then((res) => {
+      return res;
+    });
+
+    const responseData = response.data;
+    const statusCode = response.status;
+
+    if (statusCode > 400 && statusCode < 500) {
       // If response status code is in the skipRetryOnStatusCodes, don't attempt retry
       if (skipRetryOnStatusCodes.includes(response.status)) {
         return {
@@ -94,6 +111,11 @@ async function fetchData(
           message: responseData,
         };
       }
+    } else {
+      return {
+        status: true,
+        data: responseData,
+      };
     }
   } catch (error) {
     return {

clientlibs/js/src/functions/setAltUserIds.ts

@@ -18,7 +18,7 @@ export default async function setAltUserIds(
     token,
     clientSessionId,
     data,
-    Types.REQUEST_TYPES.POST,
+    Types.REQUEST_TYPES.PATCH,
     false,
     skipRetryOnStatusCodes
   );

clientlibs/js/src/functions/setGroupMembership.ts

@@ -13,7 +13,7 @@ export default async function setGroupMembership(
     token,
     clientSessionId,
     { id: userId, group: group },
-    Types.REQUEST_TYPES.POST
+    Types.REQUEST_TYPES.PATCH
   );
   if (response.status) {
     return response.data;

clientlibs/js/src/functions/setWorkingGroup.ts

@@ -13,7 +13,7 @@ export default async function setWorkingGroup(
     token,
     clientSessionId,
     { id: userId, workingGroup: workingGroup },
-    Types.REQUEST_TYPES.POST
+    Types.REQUEST_TYPES.PATCH
   );
   if (response.status) {
     return response.data;

clientlibs/js/src/index.ts

@@ -1 +1,2 @@
-export { default as UpgradeClient } from './UpgradeClient';
+import UpgradeClient from './UpgradeClient';
+export default UpgradeClient;

clientlibs/js/webpack.config.ts

@@ -1,30 +1,45 @@
 const path = require("path");
 
-module.exports = {
-  mode: "production",
-  entry: "./src/index.ts",
+const generalConfiguration = {
+  mode: 'production',
+  entry: './src/index.ts',
   module: {
     rules: [
       {
         test: /\.tsx?$/,
-        use: "ts-loader",
-        exclude: [
-          /node_modules/,
-          /\.spec.ts$/
-        ],
+        use: 'ts-loader',
+        exclude: [/node_modules/, /\.spec.ts$/],
       },
     ],
   },
   resolve: {
     alias: {
-      upgrade_types: path.resolve(__dirname, "../../types/src"),
+      upgrade_types: path.resolve(__dirname, '../../types/src'),
     },
-    extensions: [".tsx", ".ts", ".js"],
+    extensions: ['.tsx', '.ts', '.js'],
   },
+};
+
+const browser = {
+  ...generalConfiguration,
   output: {
-    filename: "bundle.js",
-    path: path.resolve(__dirname, "dist"),
-    libraryTarget: "umd",
-    library: "upgrade-client-lib",
+    filename: 'index.js',
+    path: path.resolve(__dirname, 'dist/browser'),
+    libraryTarget: 'umd',
+    library: 'upgrade-client-lib',
+    libraryExport: 'default',
   },
 };
+
+const node = {
+  ...generalConfiguration,
+  target: 'node',
+  output: {
+    filename: 'index.js',
+    path: path.resolve(__dirname, 'dist/node'),
+    libraryTarget: 'umd',
+    library: 'upgrade-client-lib',
+  },
+};
+
+module.exports = [browser, node];