Merge pull request #13 from VeliovGroup/cordova-1

🚢 v2.4.1
veliovgroup · Sep 29, 2019 · 722c07b · 722c07b
2 parents 417bda1 + 4c6ac19
commit 722c07b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.versions b/.versions
@@ -22,7 +22,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-local-test:ostrio:[email protected].0
+local-test:ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -35,7 +35,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-ostrio:[email protected].0
+ostrio:[email protected].1
 [email protected]
 [email protected]
 [email protected]

diff --git a/README.md b/README.md
@@ -27,11 +27,14 @@ meteor add ostrio:cookies
 import { Cookies } from 'meteor/ostrio:cookies';
 ```
 
-## API:
+## FAQ:
+
+- __Cookies are missing on Server__ — In 99% cases it's caused by Meteor's `webapp` http server callback-chain disorder. Make sure `new Cookies()` is called before *Routes* are registered. Routing packages usually take care of `*` (e.g. catch-all or 404) route, not passing request further to callback-chain. And as freshly installed package it would be placed at the end of `.meteor/packages` file, where list-order matters. We recommend to place `ostrio:cookies` package above all community packages in `.meteor/packages` list.
 
-__Note:__ On a server, cookies will be set __only__ after headers are sent (on next route or page reload). To send cookies from *Client* to *Server* without a page reload use `send()` method.
+## API:
 
-__Server Usage Note:__ On a server Cookies implemented as a middleware. To get access to current user's cookies use `req.Cookies` instance. For more - see examples section below.
+- __Note__ — On a server, cookies will be set __only__ after headers are sent (on next route or page reload). To send cookies from *Client* to *Server* without a page reload use `send()` method.
+- __Server Usage Note__ — On a server Cookies implemented as a middleware. To get access to current user's cookies use `req.Cookies` instance. For more - see examples section below.
 
 ### Fetch cookies `new Cookies(opts)` [*Isomorphic*]
 

diff --git a/cookies.js b/cookies.js
@@ -11,9 +11,9 @@ if (Meteor.isServer) {
 
 const NoOp  = () => {};
 const urlRE = /\/___cookie___\/set/;
-const rootUrlRE = Meteor.isServer ? process.env.ROOT_URL : (window.__meteor_runtime_config__.ROOT_URL || window.__meteor_runtime_config__.meteorEnv.ROOT_URL || false);
-const mobileRootUrlRE = Meteor.isServer ? process.env.MOBILE_ROOT_URL : (window.__meteor_runtime_config__.MOBILE_ROOT_URL || window.__meteor_runtime_config__.meteorEnv.MOBILE_ROOT_URL || false);
-const originRE = new RegExp(`^https?:\/\/(localhost:12\\d\\d\\d${rootUrlRE ? ('|' + rootUrlRE) : ''}${mobileRootUrlRE ? ('|' + mobileRootUrlRE) : ''})$`);
+const rootUrl = Meteor.isServer ? process.env.ROOT_URL : (window.__meteor_runtime_config__.ROOT_URL || window.__meteor_runtime_config__.meteorEnv.ROOT_URL || false);
+const mobileRootUrl = Meteor.isServer ? process.env.MOBILE_ROOT_URL : (window.__meteor_runtime_config__.MOBILE_ROOT_URL || window.__meteor_runtime_config__.meteorEnv.MOBILE_ROOT_URL || false);
+const originRE = new RegExp(`^https?:\/\/(localhost:12\\d\\d\\d${rootUrl ? ('|' + rootUrl) : ''}${mobileRootUrl ? ('|' + mobileRootUrl) : ''})$`);
 
 const helpers = {
   isUndefined(obj) {

diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:cookies',
-  version: '2.4.0',
+  version: '2.4.1',
   summary: 'Isomorphic bulletproof Server, Client, Browser and Cordova cookies',
   git: 'https://github.com/VeliovGroup/Meteor-Cookies',
   documentation: 'README.md'