Merge branch 'master' into add-deprecation-policy

Author: mtrezza

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
             MONGODB_STORAGE_ENGINE: wiredTiger
             NODE_VERSION: 14.15.5
           - name: Mongo 4.0, ReplicaSet, WiredTiger
-            MONGODB_VERSION: 4.0.22
+            MONGODB_VERSION: 4.0.23
             MONGODB_TOPOLOGY: replicaset
             MONGODB_STORAGE_ENGINE: wiredTiger
             NODE_VERSION: 14.15.5
@@ -76,7 +76,7 @@ jobs:
             MONGODB_VERSION: 4.4.4
             MONGODB_TOPOLOGY: standalone
             MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 15.8.0
+            NODE_VERSION: 15.9.0
     name: ${{ matrix.name }}
     timeout-minutes: 30
     runs-on: ubuntu-18.04

CHANGELOG.md

@@ -21,12 +21,14 @@ ___
 - NEW: Supporting patterns in LiveQuery server's config parameter `classNames` [#7131](https://github.com/parse-community/parse-server/pull/7131). Thanks to [Nes-si](https://github.com/Nes-si)
 - NEW: `requireAnyUserRoles` and `requireAllUserRoles` for Parse Cloud validator. [#7097](https://github.com/parse-community/parse-server/pull/7097). Thanks to [dblythy](https://github.com/dblythy)
 - NEW: Added Deprecation Policy to govern the introduction of braking changes in a phased pattern that is more predictable for developers. [#7199](https://github.com/parse-community/parse-server/pull/7199). Thanks to [Manuel Trezza](https://github.com/mtrezza).
+- IMPROVE: Retry transactions on MongoDB when it fails due to transient error [#7187](https://github.com/parse-community/parse-server/pull/7187). Thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo).
 - IMPROVE: Bump tests to use Mongo 4.4.4 [#7184](https://github.com/parse-community/parse-server/pull/7184). Thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo).
 - IMPROVE: Added new account lockout policy option `accountLockout.unlockOnPasswordReset` to automatically unlock account on password reset. [#7146](https://github.com/parse-community/parse-server/pull/7146). Thanks to [Manuel Trezza](https://github.com/mtrezza).
 - IMPROVE: Parse Server is from now on continuously tested against all recent MongoDB versions that have not reached their end-of-life support date. Added MongoDB compatibility table to Parse Server docs. [7161](https://github.com/parse-community/parse-server/pull/7161). Thanks to [Manuel Trezza](https://github.com/mtrezza).
 - IMPROVE: Parse Server is from now on continuously tested against all recent Node.js versions that have not reached their end-of-life support date. [7161](https://github.com/parse-community/parse-server/pull/7177). Thanks to [Manuel Trezza](https://github.com/mtrezza).
 - IMPROVE: Optimize queries on classes with pointer permissions. [#7061](https://github.com/parse-community/parse-server/pull/7061). Thanks to [Pedro Diaz](https://github.com/pdiaz)
 - IMPROVE: Parse Server will from now on be continuously tested against all relevant Postgres versions (minor versions). Added Postgres compatibility table to Parse Server docs. [#7176](https://github.com/parse-community/parse-server/pull/7176). Thanks to [Corey Baker](https://github.com/cbaker6).
+- FIX: Fix error when a not yet inserted job is updated [#7196](https://github.com/parse-community/parse-server/pull/7196). Thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo).
 - FIX: request.context for afterFind triggers. [#7078](https://github.com/parse-community/parse-server/pull/7078). Thanks to [dblythy](https://github.com/dblythy)
 - FIX: Winston Logger interpolating stdout to console [#7114](https://github.com/parse-community/parse-server/pull/7114). Thanks to [dplewis](https://github.com/dplewis)
 

CONTRIBUTING.md

@@ -82,6 +82,8 @@ Once you have babel running in watch mode, you can start making changes to parse
 * The `lib/` folder is not committed, so never make changes in there.
 * Always make changes to files in the `src/` folder.
 * All the tests should point to sources in the `lib/` folder.
+* The `lib/` folder is produced by `babel` using either the `npm run build`, `npm run watch`, or the `npm run prepare` step.
+* The `npm run prepare` step is automatically invoked when your package depends on forked parse-server installed via git for example using `npm install --save git+https://github.com/[username]/parse-server#[branch/commit]`.
 
 ### Troubleshooting
 
@@ -92,7 +94,10 @@ Once you have babel running in watch mode, you can start making changes to parse
 *Answer*: The easiest way is to install [Jasmine Test Explorer](https://marketplace.visualstudio.com/items?itemName=hbenl.vscode-test-explorer), it will let you run selectively tests and debug them.
 
 *Question*: How do I deploy my forked version on my servers?<br/>
-*Answer*: In your `package.json`, update the `parse-server` dependency to `https://github.com/MY_USERNAME/parse-server#MY_FEATURE`. Run `npm install`, commit the changes and deploy to your servers.
+*Answer*: In your `package.json`, update the `parse-server` dependency to `https://github.com/[username]/parse-server#[branch/commit]`. Run `npm install`, commit the changes and deploy to your servers.
+
+*Question*: How do I deploy my forked version using docker?<br/>
+*Answer*: In your `package.json`, update the `parse-server` dependency to `https://github.com/[username]/parse-server#[branch/commit]`. Make sure the `npm install` step in your `Dockerfile` is running under non-privileged user for the ``npm run prepare`` step to work correctly. For official node images from hub.docker.com that non-privileged user is `node` with `/home/node` working directory.
 
 
 ### Please Do's

README.md

@@ -109,15 +109,15 @@ Parse Server is continuously tested with the most recent releases of Node.js to
 | Node.js 10 | 10.23.2              | April 2021       | ✅ Fully compatible |
 | Node.js 12 | 12.20.1              | April 2022       | ✅ Fully compatible |
 | Node.js 14 | 14.15.4              | April 2023       | ✅ Fully compatible |
-| Node.js 15 | 15.8.0               | June 2021        | ✅ Fully compatible |
+| Node.js 15 | 15.9.0               | June 2021        | ✅ Fully compatible |
 
 #### MongoDB
 Parse Server is continuously tested with the most recent releases of MongoDB to ensure compatibility. We follow the [MongoDB support schedule](https://www.mongodb.com/support-policy) and only test against versions that are officially supported and have not reached their end-of-life date.
 
 | Version     | Latest Patch Version | End-of-Life Date | Compatibility      |
 |-------------|----------------------|------------------|--------------------|
 | MongoDB 3.6 | 3.6.21               | April 2021       | ✅ Fully compatible |
-| MongoDB 4.0 | 4.0.22               | January 2022     | ✅ Fully compatible |
+| MongoDB 4.0 | 4.0.23               | January 2022     | ✅ Fully compatible |
 | MongoDB 4.2 | 4.2.12               | TBD              | ✅ Fully compatible |
 | MongoDB 4.4 | 4.4.4                | TBD              | ✅ Fully compatible |
 

package-lock.json

@@ -49,7 +49,7 @@
     "mongodb": "3.6.3",
     "mustache": "4.1.0",
     "parse": "2.19.0",
-    "pg-promise": "10.9.1",
+    "pg-promise": "10.9.2",
     "pluralize": "8.0.0",
     "redis": "3.0.2",
     "semver": "7.3.4",
@@ -108,7 +108,7 @@
     "test:mongodb:runnerstart": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=$npm_config_dbversion} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner start",
     "test:mongodb:testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=$npm_config_dbversion} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
     "test:mongodb": "npm run test:mongodb:runnerstart --dbversion=$npm_config_dbversion && npm run test:mongodb:testonly --dbversion=$npm_config_dbversion",
-    "test:mongodb:4.0.22": "npm run test:mongodb --dbversion=4.0.22",
+    "test:mongodb:4.0.23": "npm run test:mongodb --dbversion=4.0.23",
     "test:mongodb:4.2.12": "npm run test:mongodb --dbversion=4.2.12",
     "test:mongodb:4.4.4": "npm run test:mongodb --dbversion=4.4.4",
     "posttest:mongodb": "mongodb-runner stop",

package.json

@@ -1549,7 +1549,9 @@ describe('Cloud Code', () => {
   describe('cloud jobs', () => {
     it('should define a job', done => {
       expect(() => {
-        Parse.Cloud.job('myJob', () => {});
+        Parse.Cloud.job('myJob', ({ message }) => {
+          message('Hello, world!!!');
+        });
       }).not.toThrow();
 
       request({
@@ -1559,15 +1561,19 @@ describe('Cloud Code', () => {
           'X-Parse-Application-Id': Parse.applicationId,
           'X-Parse-Master-Key': Parse.masterKey,
         },
-      }).then(
-        () => {
-          done();
-        },
-        err => {
-          fail(err);
-          done();
-        }
-      );
+      })
+        .then(async response => {
+          const jobStatusId = response.headers['x-parse-job-status-id'];
+          const checkJobStatus = async () => {
+            const jobStatus = await getJobStatus(jobStatusId);
+            return jobStatus.get('finishedAt') && jobStatus.get('message') === 'Hello, world!!!';
+          };
+          while (!(await checkJobStatus())) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should not run without master key', done => {
@@ -1602,7 +1608,6 @@ describe('Cloud Code', () => {
           expect(typeof req.jobId).toBe('string');
           expect(typeof req.message).toBe('function');
           expect(typeof res).toBe('undefined');
-          done();
         });
       }).not.toThrow();
 
@@ -1613,13 +1618,19 @@ describe('Cloud Code', () => {
           'X-Parse-Application-Id': Parse.applicationId,
           'X-Parse-Master-Key': Parse.masterKey,
         },
-      }).then(
-        () => {},
-        err => {
-          fail(err);
-          done();
-        }
-      );
+      })
+        .then(async response => {
+          const jobStatusId = response.headers['x-parse-job-status-id'];
+          const checkJobStatus = async () => {
+            const jobStatus = await getJobStatus(jobStatusId);
+            return jobStatus.get('finishedAt');
+          };
+          while (!(await checkJobStatus())) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should run with master key basic auth', done => {
@@ -1630,25 +1641,30 @@ describe('Cloud Code', () => {
           expect(typeof req.jobId).toBe('string');
           expect(typeof req.message).toBe('function');
           expect(typeof res).toBe('undefined');
-          done();
         });
       }).not.toThrow();
 
       request({
         method: 'POST',
         url: `http://${Parse.applicationId}:${Parse.masterKey}@localhost:8378/1/jobs/myJob`,
-      }).then(
-        () => {},
-        err => {
-          fail(err);
-          done();
-        }
-      );
+      })
+        .then(async response => {
+          const jobStatusId = response.headers['x-parse-job-status-id'];
+          const checkJobStatus = async () => {
+            const jobStatus = await getJobStatus(jobStatusId);
+            return jobStatus.get('finishedAt');
+          };
+          while (!(await checkJobStatus())) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should set the message / success on the job', done => {
       Parse.Cloud.job('myJob', req => {
-        const promise = req
+        return req
           .message('hello')
           .then(() => {
             return getJobStatus(req.jobId);
@@ -1657,21 +1673,6 @@ describe('Cloud Code', () => {
             expect(jobStatus.get('message')).toEqual('hello');
             expect(jobStatus.get('status')).toEqual('running');
           });
-        promise
-          .then(() => {
-            return getJobStatus(req.jobId);
-          })
-          .then(jobStatus => {
-            expect(jobStatus.get('message')).toEqual('hello');
-            expect(jobStatus.get('status')).toEqual('succeeded');
-            done();
-          })
-          .catch(err => {
-            console.error(err);
-            jfail(err);
-            done();
-          });
-        return promise;
       });
 
       request({
@@ -1681,32 +1682,28 @@ describe('Cloud Code', () => {
           'X-Parse-Application-Id': Parse.applicationId,
           'X-Parse-Master-Key': Parse.masterKey,
         },
-      }).then(
-        () => {},
-        err => {
-          fail(err);
-          done();
-        }
-      );
+      })
+        .then(async response => {
+          const jobStatusId = response.headers['x-parse-job-status-id'];
+          const checkJobStatus = async () => {
+            const jobStatus = await getJobStatus(jobStatusId);
+            return (
+              jobStatus.get('finishedAt') &&
+              jobStatus.get('message') === 'hello' &&
+              jobStatus.get('status') === 'succeeded'
+            );
+          };
+          while (!(await checkJobStatus())) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should set the failure on the job', done => {
-      Parse.Cloud.job('myJob', req => {
-        const promise = Promise.reject('Something went wrong');
-        new Promise(resolve => setTimeout(resolve, 200))
-          .then(() => {
-            return getJobStatus(req.jobId);
-          })
-          .then(jobStatus => {
-            expect(jobStatus.get('message')).toEqual('Something went wrong');
-            expect(jobStatus.get('status')).toEqual('failed');
-            done();
-          })
-          .catch(err => {
-            jfail(err);
-            done();
-          });
-        return promise;
+      Parse.Cloud.job('myJob', () => {
+        return Promise.reject('Something went wrong');
       });
 
       request({
@@ -1716,13 +1713,23 @@ describe('Cloud Code', () => {
           'X-Parse-Application-Id': Parse.applicationId,
           'X-Parse-Master-Key': Parse.masterKey,
         },
-      }).then(
-        () => {},
-        err => {
-          fail(err);
-          done();
-        }
-      );
+      })
+        .then(async response => {
+          const jobStatusId = response.headers['x-parse-job-status-id'];
+          const checkJobStatus = async () => {
+            const jobStatus = await getJobStatus(jobStatusId);
+            return (
+              jobStatus.get('finishedAt') &&
+              jobStatus.get('message') === 'Something went wrong' &&
+              jobStatus.get('status') === 'failed'
+            );
+          };
+          while (!(await checkJobStatus())) {
+            await new Promise(resolve => setTimeout(resolve, 100));
+          }
+        })
+        .then(done)
+        .catch(done.fail);
     });
 
     it('should set the failure message on the job error', async () => {