@genkaku/protocol 0.1.16 → 0.1.18

package/dist/bridge.js

@@ -4,7 +4,7 @@
 // escrow on Base Sepolia. No provider wire code leaks into dsh.
 import { appendFileSync } from 'node:fs';
 import { createServer } from 'node:http';
-import { applyLoopbackCors } from "./cors.js";
+import { applyPanelCors } from "./cors.js";
 import { openEscrow, publicClientFor, readWorker, refundSession, settleSession, signReceiptPayload, walletAddress, walletClientFor, } from "./chain.js";
 import { dialWorkerAny, fetchOffers, requestSettleCosign } from "./dial.js";
 import { dedupeOffers, toWire } from "./offer.js";
@@ -533,7 +533,7 @@ export async function startOpenAiBridge(opts) {
         void (async () => {
             try {
                 const path = (req.url ?? '/').split('?')[0] ?? '/';
-                if (!applyLoopbackCors(req, res)) {
+                if (!applyPanelCors(req, res)) {
                     res.writeHead(403, { 'content-type': 'application/json' });
                     res.end(JSON.stringify({ error: { message: 'origin not allowed' } }));
                     return;

package/dist/cors.d.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 /**
- * Apply CORS headers when the request comes from a loopback origin.
- * @returns false when a browser origin outside loopback tried to call us.
+ * Apply CORS headers when the request comes from a host allowed to show a panel.
+ * @returns false when a browser origin outside that set tried to call us.
  */
-export declare function applyLoopbackCors(req: IncomingMessage, res: ServerResponse): boolean;
+export declare function applyPanelCors(req: IncomingMessage, res: ServerResponse): boolean;
 //# sourceMappingURL=cors.d.ts.map

package/dist/cors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cors.d.ts","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAIhE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAepF"}
+{"version":3,"file":"cors.d.ts","sourceRoot":"","sources":["../src/cors.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAOhE;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAejF"}

package/dist/cors.js

@@ -1,21 +1,32 @@
-// GENKAKU: CORS for the loopback control planes.
+// GENKAKU: CORS for the local control planes.
 //
 // The bridge and the worker status server answer on 127.0.0.1 and used to send
 // `access-control-allow-origin: *`. Any website the user visited could then
-// read wallet state and, once wallet endpoints existed, key material. Only a
-// loopback Origin (the DSH web app) may read these responses.
+// read wallet state and, once wallet endpoints existed, key material. Now only
+// the two hosts that actually render a panel may read these responses:
+//
+//   - the DSH web app served from loopback (`dsh web` in a browser), and
+//   - the official DSH desktop app, whose renderer runs on `dsh-app://app`.
+//     Chromium sends that origin on every cross-origin fetch, and the app's own
+//     web route authenticates with the same string.
+//
+// `null` stays rejected. A sandboxed iframe on any website carries that origin,
+// and file:// pages do too, so allowing it would hand every page the key
+// material this gate exists to protect.
 const LOOPBACK = /^https?:\/\/(127\.0\.0\.1|localhost|\[::1\])(:\d+)?$/;
+/** Origin of the official DSH desktop renderer (Electron custom scheme). */
+const DESKTOP_APP = 'dsh-app://app';
 /**
- * Apply CORS headers when the request comes from a loopback origin.
- * @returns false when a browser origin outside loopback tried to call us.
+ * Apply CORS headers when the request comes from a host allowed to show a panel.
+ * @returns false when a browser origin outside that set tried to call us.
  */
-export function applyLoopbackCors(req, res) {
+export function applyPanelCors(req, res) {
     const origin = req.headers.origin;
     // curl, the HTML dashboard (same-origin navigation) and node clients send no
     // Origin; they are not subject to the browser's cross-origin rules.
     if (origin == null)
         return true;
-    if (!LOOPBACK.test(origin))
+    if (!LOOPBACK.test(origin) && origin !== DESKTOP_APP)
         return false;
     res.setHeader('access-control-allow-origin', origin);
     res.setHeader('vary', 'origin');

package/dist/ollama.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"AAWA,OAAO,EAAe,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE/E,oEAAoE;AACpE,MAAM,MAAM,WAAW,GAAG;IACxB,uDAAuD;IACvD,SAAS,EAAE,OAAO,CAAA;IAClB,2CAA2C;IAC3C,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,8DAA8D;IAC9D,MAAM,EAAE,SAAS,EAAE,CAAA;IACnB,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,MAAM,CAItF;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,WAAW,GAAE,MAAM,CAAC,UAAwB,GAC3C,MAAM,GAAG,SAAS,CAuBpB;AASD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,4DAA4D;IAC5D,KAAK,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,mEAAmE;IACnE,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACzC,6DAA6D;IAC7D,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAClH,wCAAwC;IACxC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxC,sDAAsD;IACtD,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,gBAAgB,CA0FlG"}
+{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../src/ollama.ts"],"names":[],"mappings":"AAWA,OAAO,EAAe,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE/E,oEAAoE;AACpE,MAAM,MAAM,WAAW,GAAG;IACxB,uDAAuD;IACvD,SAAS,EAAE,OAAO,CAAA;IAClB,2CAA2C;IAC3C,OAAO,EAAE,OAAO,CAAA;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAA;IACnB,8DAA8D;IAC9D,MAAM,EAAE,SAAS,EAAE,CAAA;IACnB,+DAA+D;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,MAAM,CAItF;AAED;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,WAAW,GAAE,MAAM,CAAC,UAAwB,GAC3C,MAAM,GAAG,SAAS,CAuBpB;AASD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,4DAA4D;IAC5D,KAAK,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,mEAAmE;IACnE,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACzC,6DAA6D;IAC7D,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAClH,wCAAwC;IACxC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxC,sDAAsD;IACtD,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,gBAAgB,CA4FlG"}

package/dist/ollama.js

@@ -116,6 +116,8 @@ export function createOllamaSupervisor(host, log) {
             env: { ...process.env, OLLAMA_HOST: url.host },
             stdio: 'ignore',
             detached: false,
+            // Windows: do not flash a console window when the panel starts Ollama.
+            windowsHide: true,
         });
         child = spawned;
         spawned.once('error', (error) => { log(`ollama spawn failed (${error.message})`); });

package/dist/p2pNode.d.ts

@@ -26,6 +26,8 @@ export type SidecarOptions = {
     /** Public relay multiaddrs (the seed VM). Dialed at boot so the circuit
      *  transport can reserve a slot, which makes a NAT'd worker dialable. */
     relayHints?: string[];
+    /** Diagnostic sink (IPv6 fallback, listener warnings). */
+    log?: (line: string) => void;
 };
 /** One stored (latest) receipt per jobId — the evidence the settle co-sign
  *  defends against (spend == max cumulative receipt the client piped). */ export type StoredReceipt = {

package/dist/p2pNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"p2pNode.d.ts","sourceRoot":"","sources":["../src/p2pNode.ts"],"names":[],"mappings":"AAcA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAA;AAClD,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAA;AAIxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,OAAO,EAAoB,KAAK,KAAK,EAAU,MAAM,YAAY,CAAA;AAajE,OAAO,KAAK,EAAgB,YAAY,EAAiB,MAAM,oBAAoB,CAAA;AAGnF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,eAAO,MAAM,iBAAiB,2JAQpB,CAAA;AAEV,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,2EAA2E;IAC3E,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,+EAA+E;IAC/E,OAAO,EAAE,KAAK,EAAE,CAAA;IAChB,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,gFAAgF;IAChF,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;kFAC8E;IAC9E,SAAS,CAAC,EAAE,GAAG,CAAA;IACf;6EACyE;IACzE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB,CAAA;AAED;0EAC0E,CAAA,MAAM,MAAM,aAAa,GAAG;IACpG,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAA;IAChB,kEAAkE;IAClE,SAAS,EAAE,KAAK,MAAM,EAAE,CAAA;IACxB,UAAU,EAAE,KAAK,MAAM,EAAE,CAAA;CAC1B,CAAA;AAkBD,+EAA+E;AAC/E,wBAAsB,cAAc,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAY3E;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,MAAM,EAAE,CAAA;IACzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,cAAc,EAAE,MAAM,MAAM,CAAA;IAC5B,+DAA+D;IAC/D,SAAS,EAAE,MAAM,MAAM,CAAA;IACvB,qEAAqE;IACrE,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAA;CACtC,CAAA;AAOD,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAggBjF"}
+{"version":3,"file":"p2pNode.d.ts","sourceRoot":"","sources":["../src/p2pNode.ts"],"names":[],"mappings":"AAcA,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAA;AAClD,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAA;AAIxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,OAAO,EAAoB,KAAK,KAAK,EAAU,MAAM,YAAY,CAAA;AAajE,OAAO,KAAK,EAAgB,YAAY,EAAiB,MAAM,oBAAoB,CAAA;AAGnF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC,eAAO,MAAM,iBAAiB,2JAQpB,CAAA;AAEV,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,WAAW,CAAA;IACxB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,eAAe,CAAA;IAC5B,2EAA2E;IAC3E,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,+EAA+E;IAC/E,OAAO,EAAE,KAAK,EAAE,CAAA;IAChB,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,gFAAgF;IAChF,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB;kFAC8E;IAC9E,SAAS,CAAC,EAAE,GAAG,CAAA;IACf;6EACyE;IACzE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,0DAA0D;IAC1D,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAC7B,CAAA;AAED;0EAC0E,CAAA,MAAM,MAAM,aAAa,GAAG;IACpG,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,CAAA;IACX,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAA;IAChB,kEAAkE;IAClE,SAAS,EAAE,KAAK,MAAM,EAAE,CAAA;IACxB,UAAU,EAAE,KAAK,MAAM,EAAE,CAAA;CAC1B,CAAA;AAkBD,+EAA+E;AAC/E,wBAAsB,cAAc,CAAC,MAAM,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAY3E;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,MAAM,EAAE,CAAA;IACzB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,cAAc,EAAE,MAAM,MAAM,CAAA;IAC5B,+DAA+D;IAC/D,SAAS,EAAE,MAAM,MAAM,CAAA;IACvB,qEAAqE;IACrE,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAA;CACtC,CAAA;AAOD,wBAAsB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CA8gBjF"}

package/dist/p2pNode.js

@@ -111,15 +111,29 @@ export async function createSidecar(opts) {
         ? privateKeyFromRaw(toBytes(opts.workerKey))
         : await generateKeyPair('secp256k1');
     const peerId = peerIdFromPrivateKey(privateKey);
-    const node = await createLibp2p({
+    // The default listen list includes IPv6. A Windows machine (or a Linux box
+    // with IPv6 disabled) can refuse that listener; losing the whole worker over
+    // a second address family would look like "the plugin does nothing".
+    const init = (listen) => ({
         privateKey,
         nodeInfo: NODE_INFO,
-        addresses: { listen: [...new Set([...opts.listen, '/p2p-circuit'])] },
+        addresses: { listen: [...new Set([...listen, '/p2p-circuit'])] },
         transports: [tcp(), circuitRelayTransport()],
         connectionEncrypters: [noise()],
         streamMuxers: [yamux()],
         services: { identify: identify() },
     });
+    let node;
+    try {
+        node = await createLibp2p(init(opts.listen));
+    }
+    catch (error) {
+        const ipv4 = opts.listen.filter(addr => !addr.startsWith('/ip6/'));
+        if (ipv4.length === opts.listen.length || ipv4.length === 0)
+            throw error;
+        opts.log?.(`IPv6 listen unavailable (${error instanceof Error ? error.message : String(error)}); retrying on IPv4 only`);
+        node = await createLibp2p(init(ipv4));
+    }
     // Connect to the public relay up front: the circuit transport reserves a
     // slot only once a HOP-capable peer is connected. Failures are non-fatal —
     // a worker with a public address is still directly dialable.

package/dist/status.js

@@ -2,7 +2,7 @@
 // GET /genkaku/status (JSON). Snapshot is called per request so the page and
 // the JSON always reflect the live sidecar, never a boot-time copy.
 import { createServer } from 'node:http';
-import { applyLoopbackCors } from "./cors.js";
+import { applyPanelCors } from "./cors.js";
 /** Self-contained dashboard; mirrors the user bridge style and polls the JSON. */
 const DASHBOARD_HTML = `<!doctype html>
 <html lang="en">
@@ -171,7 +171,7 @@ export async function startStatusServer(port, snapshot, onCatalog, onMode, ollam
         void (async () => {
             try {
                 const path = (req.url ?? '/').split('?')[0] ?? '/';
-                if (!applyLoopbackCors(req, res)) {
+                if (!applyPanelCors(req, res)) {
                     res.writeHead(403, { 'content-type': 'application/json' });
                     res.end(JSON.stringify({ error: { message: 'origin not allowed' } }));
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genkaku/protocol",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "GenKaKu protocol core: on-chain worker directory, USDC escrow billing, libp2p transport, Ollama lifecycle",
   "license": "MIT",
   "type": "module",