neoagent 2.3.1-beta.52 → 2.3.1-beta.54

package/flutter_app/android/app/src/main/res/values/arrays.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Hosts allowed to connect to the Android Auto app. Update as needed. -->
+    <string-array name="hosts_allowlist">
+        <item>androidx.car.app</item>
+        <item>com.google.android.projection.gearhead</item>
+    </string-array>
+</resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "2.3.1-beta.52",
+  "version": "2.3.1-beta.54",
   "description": "Proactive personal AI agent with no limits",
   "license": "MIT",
   "main": "server/index.js",

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"42d3d75a56efe1a2e9902f52dc8006099c45d9
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "2273256777" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "3319853538" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });

package/server/routes/auth.js

@@ -330,7 +330,12 @@ router.get('/api/auth/providers/complete', async (req, res) => {
     if (!user) {
       return res.status(404).json({ error: 'User not found' });
     }
-    if (getTwoFactorStatus(user.id).enabled) {
+    // Skip secondary two-factor when signing in via certain social providers.
+    // Currently skip for Google (`provider === 'google`).
+    const providerKey = String(completion.provider || '').trim();
+    const twoFactor = getTwoFactorStatus(user.id);
+    const skipTwoFactorForProviders = new Set(['google']);
+    if (twoFactor.enabled && !skipTwoFactorForProviders.has(providerKey)) {
       return establishPendingTwoFactorSession(req, res, user);
     }
     updateLastLogin(user.id);

package/server/services/messaging/meshtastic.js

@@ -76,6 +76,7 @@ class MeshtasticPlatform extends BasePlatform {
     this._connectPromise = null;
     this._disconnecting = false;
     this._reconnectTimer = null;
+    this._reconnectDelayMs = 10000;
   }
 
   async connect() {
@@ -109,7 +110,11 @@ class MeshtasticPlatform extends BasePlatform {
       await staleTransport.disconnect().catch(() => {});
     }
 
-    const transport = await MeshtasticTcpTransport.create(this.host, this.port, 60000);
+    const transport = await MeshtasticTcpTransport.create(this.host, this.port, 60000, {
+      // This service only needs the local node info plus live packets. Pulling
+      // the full node DB on each reconnect adds avoidable load to Wi-Fi radios.
+      noNodes: true,
+    });
     this._transport = transport;
 
     const conn = transport.connection;
@@ -189,6 +194,7 @@ class MeshtasticPlatform extends BasePlatform {
     });
 
     this.status = 'connected';
+    this._reconnectDelayMs = 10000;
     this.authInfo = this._buildAuthInfo(conn);
     this.emit('connected');
     return { status: this.status };
@@ -196,7 +202,8 @@ class MeshtasticPlatform extends BasePlatform {
 
   _scheduleReconnect() {
     if (this._disconnecting || this._reconnectTimer) return;
-    console.log(`[Meshtastic] Connection lost. Reconnecting in 10 seconds...`);
+    const delayMs = this._reconnectDelayMs;
+    console.log(`[Meshtastic] Connection lost. Reconnecting in ${Math.round(delayMs / 1000)} seconds...`);
     this._reconnectTimer = setTimeout(() => {
       this._reconnectTimer = null;
       if (this._disconnecting) return;
@@ -204,7 +211,8 @@ class MeshtasticPlatform extends BasePlatform {
         console.error(`[Meshtastic] Auto-reconnect failed:`, err.message);
         this._scheduleReconnect();
       });
-    }, 10000);
+    }, delayMs);
+    this._reconnectDelayMs = Math.min(delayMs * 2, 60000);
   }
 
   _buildAuthInfo(conn) {

package/server/services/messaging/meshtastic_protocol.js

@@ -8,6 +8,7 @@ const FRAME_START_1 = 0x94;
 const FRAME_START_2 = 0xC3;
 
 const BROADCAST_NUM = 0xFFFFFFFF;
+const NODELESS_WANT_CONFIG_ID = 69420;
 
 // PortNum values from public protocol specification
 const PortNum = Object.freeze({
@@ -174,6 +175,21 @@ function encodeToRadioWantConfig(configId) {
   return new Uint8Array(encodeVarintField(3, configId));
 }
 
+function resolveWantConfigId(options = {}) {
+  if (Number.isInteger(options.wantConfigId) && options.wantConfigId >= 0) {
+    return options.wantConfigId >>> 0;
+  }
+  if (options.noNodes) {
+    return NODELESS_WANT_CONFIG_ID;
+  }
+
+  let configId = (Math.random() * 0xFFFFFFFF) >>> 0;
+  if (configId === NODELESS_WANT_CONFIG_ID) {
+    configId = (configId + 1) >>> 0;
+  }
+  return configId;
+}
+
 function decodeUser(buf) {
   const fields = decodeFields(buf);
   return {
@@ -288,10 +304,10 @@ function createFrameParser(onPacket) {
 // --------------------------------------------------------------------------
 
 class MeshtasticConnection extends EventEmitter {
-  constructor() {
+  constructor(options = {}) {
     super();
     this._socket = null;
-    this._configId = (Math.random() * 0x7FFFFFFF) >>> 0;
+    this._configId = resolveWantConfigId(options);
     this._myNodeNum = 0;
     this._configured = false;
     this._closing = false;
@@ -316,6 +332,9 @@ class MeshtasticConnection extends EventEmitter {
       let settled = false;
       let timer = null;
 
+      socket.setKeepAlive(true, 15000);
+      socket.setNoDelay(true);
+
       const cleanupHandshake = () => {
         if (timer) {
           clearTimeout(timer);
@@ -487,6 +506,8 @@ class MeshtasticConnection extends EventEmitter {
     this._socket = null;
     if (socket) {
       socket.removeAllListeners();
+      socket.end();
+      socket.destroySoon?.();
       socket.destroy();
     }
   }
@@ -496,12 +517,14 @@ module.exports = {
   MeshtasticConnection,
   PortNum,
   BROADCAST_NUM,
+  NODELESS_WANT_CONFIG_ID,
   encodeVarint,
   decodeVarint,
   decodeFields,
   decodeFromRadio,
   decodeMeshPacket,
   decodeUser,
+  encodeToRadioWantConfig,
   framePacket,
   createFrameParser,
 };

package/server/services/messaging/meshtastic_protocol.test.js

@@ -0,0 +1,33 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const {
+  MeshtasticConnection,
+  NODELESS_WANT_CONFIG_ID,
+  decodeFields,
+  encodeToRadioWantConfig,
+} = require('./meshtastic_protocol');
+
+test('nodeless startup uses Meshtastic special want_config_id', () => {
+  const connection = new MeshtasticConnection({ noNodes: true });
+  assert.equal(connection._configId, NODELESS_WANT_CONFIG_ID);
+});
+
+test('default startup never collides with nodeless want_config_id', () => {
+  const originalRandom = Math.random;
+  Math.random = () => NODELESS_WANT_CONFIG_ID / 0xFFFFFFFF;
+  try {
+    const connection = new MeshtasticConnection();
+    assert.notEqual(connection._configId, NODELESS_WANT_CONFIG_ID);
+  } finally {
+    Math.random = originalRandom;
+  }
+});
+
+test('want_config packets encode the requested config id in field 3', () => {
+  const packet = Buffer.from(encodeToRadioWantConfig(NODELESS_WANT_CONFIG_ID));
+  const fields = decodeFields(packet);
+  assert.deepEqual(fields, [
+    { field: 3, wire: 0, value: NODELESS_WANT_CONFIG_ID },
+  ]);
+});

package/server/services/messaging/meshtastic_tcp_transport.js

@@ -7,8 +7,8 @@ class MeshtasticTcpTransport {
     this._connection = connection;
   }
 
-  static async create(hostname, port = 4403, timeout = 60000) {
-    const connection = new MeshtasticConnection();
+  static async create(hostname, port = 4403, timeout = 60000, options = {}) {
+    const connection = new MeshtasticConnection(options);
     await connection.connect(hostname, port, timeout);
     return new MeshtasticTcpTransport(connection);
   }