Merge pull request #131 from meteorrn/dev

Release 2.6.0

Author: jankapunkt

.gitignore

@@ -30,4 +30,3 @@ node_modules
 .vscode
 .idea
 .DS_Store
-

companion-packages/meteorrn-local/index.js

@@ -96,11 +96,12 @@ const Local = {
 
       LiveCol.find({}).observe({
         added: async (doc) => {
-          LocalCol._collection.upsert(doc);
+          LocalCol.insert(doc);
           storeLocalCol();
         },
-        changed: async (doc) => {
-          LocalCol._collection.upsert(doc);
+        changed: async (changes, oldDoc) => {
+          delete changes._id;
+          LocalCol.update(oldDoc._id, { $set: changes });
           storeLocalCol();
         },
       });

companion-packages/meteorrn-local/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorrn/local",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Store data locally",
   "main": "index.js",
   "scripts": {

docs/api.md

@@ -23,6 +23,7 @@ Connect to the Meteor Server
 - autoReconnect **boolean** [true] whether to try to reconnect to the server when the socket connection closes, unless the closing was initiated by a call to the disconnect method.
 - reconnectInterval **number** [10000] the interval in ms between reconnection attempts.
 - AsyncStorage **object** your preferred AsyncStorage. Defaults to `'@react-native-async-storage/async-storage'` as a peer dependency.
+- reachabilityUrl **string** ["https://clients3.google.com/generate_204"] server to check internet reachability, used by NetInfo. If not provided, NetInfos default url will be used, which currently is `'https://clients3.google.com/generate_204'`
 
 ### `Meteor.disconnect()`
 

lib/ddp.js

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import EventEmitter from 'eventemitter3';
 import Queue from './queue';
 import Socket from './socket';
 import { uniqueId } from './utils';
@@ -115,6 +115,7 @@ export default class DDP extends EventEmitter {
     this.socket.on('message:in', (message) => {
       if (message.msg === 'connected') {
         this.status = 'connected';
+        this._lastSessionId = message.session;
         this.messageQueue.process();
         this.emit('connected');
       } else if (message.msg === 'ping') {

lib/socket.js

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import EventEmitter from 'eventemitter3';
 import EJSON from 'ejson';
 import './mongo-id'; //  Register mongo object ids */
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorrn/core",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Full Meteor Client for React Native",
   "main": "src/index.js",
   "repository": {
@@ -28,7 +28,8 @@
   "homepage": "https://github.com/TheRealNate/meteor-react-native#readme",
   "dependencies": {
     "@meteorrn/minimongo": "1.0.1",
-    "ejson": "2.2.3"
+    "ejson": "2.2.3",
+    "eventemitter3": "^5.0.1"
   },
   "devDependencies": {
     "@babel/core": "7.19.6",

package.json

@@ -113,7 +113,16 @@ const Meteor = {
 
     try {
       const NetInfo = require('@react-native-community/netinfo').default;
+
+      if (options.reachabilityUrl) {
+        NetInfo.configure({
+          reachabilityUrl: options.reachabilityUrl,
+          useNativeReachability: true,
+        });
+      }
+
       // Reconnect if we lose internet
+
       NetInfo.addEventListener(
         ({ type, isConnected, isInternetReachable, isWifiEnabled }) => {
           if (isConnected && Data.ddp.autoReconnect) {
@@ -160,6 +169,13 @@ const Meteor = {
         console.info('Disconnected from DDP server.');
       }
 
+      // Mark subscriptions as ready=false
+      for (var i in Data.subscriptions) {
+        const sub = Data.subscriptions[i];
+        sub.ready = false;
+        sub.readyDeps.changed();
+      }
+
       if (!Data.ddp.autoReconnect) return;
 
       if (!lastDisconnect || new Date() - lastDisconnect > 3000) {

src/Meteor.js

@@ -177,6 +177,8 @@ const User = {
             }
             this._loadInitialUser();
           }, time + 100);
+        } else if (err?.error === 403) {
+          User.logout();
         } else {
           User._handleLoginCallback(err, result);
         }