Merge branch 'master' into CLEN-1127

.eslintrc.js

@@ -17,5 +17,6 @@ module.exports = {
     'class-methods-use-this': 0,
     'no-prototype-builtins': 1,
     'prefer-destructuring': 0,
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
   },
 };

.github/workflows/commands-handler.yml

@@ -11,7 +11,9 @@ jobs:
   process:
     name: Process command
     if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     steps:
       - name: Check referred user
         id: user-check

.github/workflows/release.yml

@@ -8,7 +8,9 @@ on:
 jobs:
   check-release:
     name: Check release required
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     if: github.event.pull_request.merged && endsWith(github.repository, '-private') != true
     outputs:
       release: ${{ steps.check.outputs.ready }}
@@ -27,7 +29,9 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
   publish:
     name: Publish package
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     needs: check-release
     if: needs.check-release.outputs.release == 'true'
     steps:
@@ -43,16 +47,13 @@ jobs:
           ref: v1
           token: ${{ secrets.GH_TOKEN }}
           path: .github/.release/actions
-      - name: configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
-          role-session-name: javascript-sdk-s3-upload
-          aws-region: us-east-1
       - name: Publish to S3
         uses: ./.github/.release/actions/actions/services/aws
         with:
           token: ${{ secrets.GH_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          auth-method: access-key
           content-type: application/javascript
           content-encoding: gzip
           acl: public-read

.github/workflows/run-tests.yml

@@ -15,11 +15,13 @@ env:
 jobs:
   tests:
     name: Integration and Unit tests
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     strategy:
       fail-fast: true
       matrix:
-        node: [12, 14, 16]
+        node: [14, 16]
         env: ["ci:node"]
         include:
           - node: 16
@@ -49,7 +51,9 @@ jobs:
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
   all-tests:
     name: Tests
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     needs: [tests]
     steps:
       - name: Tests summary

.github/workflows/run-validations.yml

@@ -13,7 +13,9 @@ defaults:
 jobs:
   pubnub-yml:
     name: "Validate .pubnub.yml"
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -33,7 +35,9 @@ jobs:
         uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
   all-validations:
     name: Validations
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Default Larger Runners
+      labels: ubuntu-latest-m
     needs: [pubnub-yml]
     steps:
       - name: Validations summary

.pubnub.yml

@@ -1,5 +1,10 @@
 ---
 changelog:
+  - date: 2023-07-26
+    version: v7.3.0
+    changes:
+      - type: bug
+        text: "Fixes issue of severe vulnerability warnings for vm2 usage."
   - date: 2023-06-19
     version: v7.2.3
     changes:
@@ -875,7 +880,7 @@ supported-platforms:
       - 'Ubuntu 14.04 and up'
       - 'Windows 7 and up'
     version: 'Pubnub Javascript for Node'
-version: '7.2.3'
+version: '7.3.0'
 sdks:
   - full-name: PubNub Javascript SDK
     short-name: Javascript
@@ -891,7 +896,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.2.3.zip
+            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.3.0.zip
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'
@@ -1562,7 +1567,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/releases/download/v7.2.3/pubnub.7.2.3.js
+            location: https://github.com/pubnub/javascript/releases/download/v7.3.0/pubnub.7.3.0.js
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v7.3.0
+July 26 2023
+
+#### Fixed
+- Fixes issue of severe vulnerability warnings for vm2 usage.
+
+
+
 ## v7.2.3
 June 19 2023
 

README.md

@@ -22,8 +22,8 @@ You will need the publish and subscribe keys to authenticate your app. Get your
      npm install pubnub
      ```
    * or download one of our builds from our CDN: 
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.3.js
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.3.min.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.3.0.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.3.0.min.js
 
 2. Configure your keys:
 

dist/web/pubnub.js

@@ -768,7 +768,7 @@
             return this;
         };
         default_1.prototype.getVersion = function () {
-            return '7.2.3';
+            return '7.3.0';
         };
         default_1.prototype._addPnsdkSuffix = function (name, suffix) {
             this._PNSDKSuffix[name] = suffix;
@@ -6266,7 +6266,6 @@
         handleResponse: handleResponse$4
     });
 
-    /*       */
     function getOperation$3() {
         return OPERATIONS.PNMessageCounts;
     }
@@ -6277,7 +6276,7 @@
             return 'Missing channel';
         if (timetoken && channelTimetokens)
             return 'timetoken and channelTimetokens are incompatible together';
-        if (timetoken && channelTimetokens && channelTimetokens.length > 1 && channels.length !== channelTimetokens.length) {
+        if (channelTimetokens && channelTimetokens.length > 1 && channels.length !== channelTimetokens.length) {
             return 'Length of channelTimetokens and channels do not match';
         }
         if (!config.subscribeKey)

lib/core/components/config.js

@@ -169,7 +169,7 @@ var default_1 = /** @class */ (function () {
         return this;
     };
     default_1.prototype.getVersion = function () {
-        return '7.2.3';
+        return '7.3.0';
     };
     default_1.prototype._addPnsdkSuffix = function (name, suffix) {
         this._PNSDKSuffix[name] = suffix;

lib/core/endpoints/history/message_counts.js

@@ -1,5 +1,4 @@
 "use strict";
-/*       */
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -34,7 +33,7 @@ function validateParams(modules, incomingParams) {
         return 'Missing channel';
     if (timetoken && channelTimetokens)
         return 'timetoken and channelTimetokens are incompatible together';
-    if (timetoken && channelTimetokens && channelTimetokens.length > 1 && channels.length !== channelTimetokens.length) {
+    if (channelTimetokens && channelTimetokens.length > 1 && channels.length !== channelTimetokens.length) {
         return 'Length of channelTimetokens and channels do not match';
     }
     if (!config.subscribeKey)

lib/networking/modules/node.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keepAlive = exports.proxy = void 0;
 var superagent_1 = __importDefault(require("superagent"));
-var superagent_proxy_1 = __importDefault(require("superagent-proxy"));
 var agentkeepalive_1 = __importDefault(require("agentkeepalive"));
+var proxyAgent_1 = __importDefault(require("../proxyAgent"));
 var keepAliveAgent = null;
 var keepAliveSecureAgent = null;
-(0, superagent_proxy_1.default)(superagent_1.default);
+(0, proxyAgent_1.default)(superagent_1.default);
 function proxy(superagentConstruct) {
     return superagentConstruct.proxy(this._config.proxy);
 }

lib/networking/proxyAgent.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var proxy_agent_1 = require("proxy-agent");
+function default_1(superagent) {
+    var Request = superagent.Request;
+    Request.prototype.proxy = proxy;
+    return superagent;
+}
+exports.default = default_1;
+function proxy(proxyConfiguration) {
+    var agent = new proxy_agent_1.ProxyAgent(proxyConfiguration);
+    if (agent)
+        this.agent(agent);
+    return this;
+}