@savepoint/bridge 1.0.2 → 1.0.4

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import pc from 'picocolors';
-const VERSION = '1.0.2';
+const VERSION = '1.0.4';
 const [, , command, ...args] = process.argv;
 const COMMANDS = {
     setup: 'Interactive guided setup wizard',

package/dist/daemon.js

@@ -8,7 +8,7 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 import { DATA_PATH } from './logger.js';
 const BASE_URL = process.env.SAVEPOINT_APP_URL ?? process.env.SAVEPOINT_API_URL ?? 'https://app.savepointhq.com';
-const VERSION = '1.0.2';
+const VERSION = '1.0.4';
 const DB_PATH = join(DATA_PATH, 'registry.db');
 const CAPS_PATH = fileURLToPath(new URL('../../capabilities/printers.json', import.meta.url));
 const REGISTRY_REFRESH_MS = 5 * 60 * 1000;

package/dist/discovery.js

@@ -3,6 +3,8 @@ import { networkInterfaces } from 'os';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
 const execFileAsync = promisify(execFile);
+// Ports probed per host — ordered by likelihood for label/receipt printers
+const PRINTER_PORTS = [9100, 631, 515];
 function probePort(host, port, timeoutMs = 1500) {
     return new Promise(resolve => {
         const socket = createConnection({ host, port });
@@ -23,15 +25,67 @@ function getSubnetHosts() {
     }
     return [];
 }
-async function scanNetwork(concurrency = 50) {
+/** Probe a single host on all printer ports; returns first open port found or null */
+async function probeHost(host) {
+    for (const port of PRINTER_PORTS) {
+        if (await probePort(host, port)) {
+            return { name: host, host, port, connection_type: 'network' };
+        }
+    }
+    return null;
+}
+async function scanNetwork(concurrency = 30) {
     const hosts = getSubnetHosts();
     const found = [];
     for (let i = 0; i < hosts.length; i += concurrency) {
-        await Promise.allSettled(hosts.slice(i, i + concurrency).map(async (host) => {
-            if (await probePort(host, 9100)) {
-                found.push({ name: host, host, port: 9100, connection_type: 'network' });
+        const batch = await Promise.allSettled(hosts.slice(i, i + concurrency).map(host => probeHost(host)));
+        for (const result of batch) {
+            if (result.status === 'fulfilled' && result.value) {
+                found.push(result.value);
             }
-        }));
+        }
+    }
+    return found;
+}
+/**
+ * mDNS/Bonjour discovery — resolves printer names and models on the LAN.
+ * Uses `dns-sd` on macOS and `avahi-browse` on Linux; no-ops silently on Windows.
+ */
+async function scanMdns() {
+    const found = [];
+    if (process.platform === 'darwin') {
+        try {
+            // Browse for IPP and socket (raw) printer services for 5 seconds
+            const { stdout } = await execFileAsync('dns-sd', ['-B', '_ipp._tcp,_pdl-datastream._tcp', 'local.'], { timeout: 5000 }).catch(() => execFileAsync('dns-sd', ['-B', '_ipp._tcp', 'local.'], { timeout: 5000 }));
+            for (const line of stdout.split('\n')) {
+                // Lines look like: "Add   2   1 local. _ipp._tcp.   My Printer"
+                const match = line.match(/Add\s+\d+\s+\d+\s+\S+\s+\S+\s+(.+)/);
+                if (match) {
+                    const name = match[1].trim();
+                    if (name)
+                        found.push({ name, connection_type: 'network' });
+                }
+            }
+        }
+        catch { /* dns-sd timeout or unavailable */ }
+    }
+    else if (process.platform === 'linux') {
+        try {
+            const { stdout } = await execFileAsync('avahi-browse', ['-t', '-r', '-p', '_ipp._tcp'], { timeout: 5000 });
+            for (const line of stdout.split('\n')) {
+                // Resolved lines: "=;eth0;IPv4;My Printer;_ipp._tcp;local;host.local;192.168.1.x;631;..."
+                const parts = line.split(';');
+                if (parts[0] === '=' && parts.length >= 8) {
+                    const name = parts[3];
+                    const host = parts[7];
+                    const port = parseInt(parts[8], 10) || 631;
+                    if (name && host) {
+                        found.push({ name, host, port, connection_type: 'network' });
+                    }
+                }
+            }
+        }
+        catch { /* avahi-browse unavailable */ }
     }
     return found;
 }
@@ -48,7 +102,30 @@ async function scanCups() {
         return []; // lpstat unavailable (Windows or CUPS not installed)
     }
 }
+/** Merge mDNS results into port-scan results — mDNS names win over raw IP labels */
+function merge(portScan, mdns) {
+    const byHost = new Map();
+    for (const p of portScan) {
+        if (p.host)
+            byHost.set(p.host, p);
+    }
+    for (const m of mdns) {
+        if (m.host && byHost.has(m.host)) {
+            // Enrich the port-scan entry with the friendly name from mDNS
+            byHost.set(m.host, { ...byHost.get(m.host), name: m.name });
+        }
+        else if (m.host) {
+            byHost.set(m.host, m);
+        }
+        else {
+            // mDNS-only (no IP resolved yet) — include as-is
+            byHost.set(m.name, m);
+        }
+    }
+    return Array.from(byHost.values());
+}
 export async function discoverPrinters() {
-    const [network, cups] = await Promise.all([scanNetwork(), scanCups()]);
+    const [portScan, mdns, cups] = await Promise.all([scanNetwork(), scanMdns(), scanCups()]);
+    const network = merge(portScan, mdns);
     return [...network, ...cups];
 }

package/dist/logs.js

@@ -6,7 +6,7 @@ function getRecentLogFiles(limit = 2) {
     if (!existsSync(logDir))
         return [];
     return readdirSync(logDir)
-        .filter((file) => file.endsWith('.log'))
+        .filter((file) => /^\d{4}-\d{2}-\d{2}\.log$/.test(file))
         .sort()
         .slice(-limit)
         .map((file) => join(logDir, file));

package/dist/service.js

@@ -2,7 +2,7 @@ import { writeFileSync, mkdirSync, unlinkSync, existsSync } from 'fs';
 import { execFile, execFileSync } from 'child_process';
 import { promisify } from 'util';
 import { homedir, userInfo } from 'os';
-import { join } from 'path';
+import { join, dirname } from 'path';
 import { log } from './logger.js';
 const execFileAsync = promisify(execFile);
 function getBinaryPath() {
@@ -21,6 +21,11 @@ async function installMacOS() {
     const logDir = join(homedir(), '.savepoint-bridge', 'logs');
     mkdirSync(plistDir, { recursive: true });
     mkdirSync(logDir, { recursive: true });
+    const home = homedir();
+    // Capture the node binary directory at install time so launchd's minimal
+    // PATH doesn't break nvm / Homebrew / Volta / system installs
+    const nodeBinDir = dirname(process.execPath);
+    const launchdPath = `/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:${nodeBinDir}`;
     writeFileSync(plistPath, `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -28,6 +33,11 @@ async function installMacOS() {
   <key>Label</key><string>com.savepoint.bridge</string>
   <key>ProgramArguments</key>
   <array><string>${binary}</string><string>start</string></array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>HOME</key><string>${home}</string>
+    <key>PATH</key><string>${launchdPath}</string>
+  </dict>
   <key>RunAtLoad</key><true/>
   <key>KeepAlive</key><true/>
   <key>StandardOutPath</key><string>${logDir}/stdout.log</string>

package/dist/setup.js

@@ -5,7 +5,7 @@ import { discoverPrinters } from './discovery.js';
 import { installService } from './service.js';
 import { log } from './logger.js';
 const BASE_URL = process.env.SAVEPOINT_APP_URL ?? process.env.SAVEPOINT_API_URL ?? 'https://app.savepointhq.com';
-const VERSION = '1.0.2';
+const VERSION = '1.0.4';
 function parseFlags(args) {
     const flags = {};
     for (const arg of args) {

package/dist/token.js

@@ -42,9 +42,12 @@ export async function loadToken() {
     const keytar = await trykeytar();
     if (keytar) {
         try {
-            return await keytar.getPassword(SERVICE, ACCOUNT);
+            const keytarToken = await keytar.getPassword(SERVICE, ACCOUNT);
+            if (keytarToken)
+                return keytarToken;
+            // null means "not in keychain" — fall through to file fallback
         }
-        catch { /* fall through */ }
+        catch { /* keychain inaccessible — fall through */ }
     }
     try {
         const raw = readFileSync(FALLBACK_PATH);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@savepoint/bridge",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "private": false,
   "description": "SavePoint Bridge hardware daemon",
   "keywords": [