pinokiod 5.3.11 → 5.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.3.11",
+  "version": "5.3.12",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -4892,27 +4892,51 @@ class Server {
       }
       const isLocalHost = (hostname) => ['localhost', '127.0.0.1', '0.0.0.0'].includes(String(hostname || '').toLowerCase())
       const hostMatches = (a, b) => a && b && a.protocol === b.protocol && a.hostname === b.hostname
+      const baseDomain = (hostname) => {
+        const parts = String(hostname || '').toLowerCase().split('.').filter(Boolean)
+        if (parts.length <= 2) return parts.join('.')
+        return parts.slice(-2).join('.')
+      }
+      const sameBaseDomain = (a, b) => {
+        const ha = String(a || '').toLowerCase()
+        const hb = String(b || '').toLowerCase()
+        if (!ha || !hb) return false
+        if (isLocalHost(ha) && isLocalHost(hb)) return true
+        return baseDomain(ha) === baseDomain(hb)
+      }
 
+      const registryRawPresent = !!registryRaw
+      const connectRawPresent = !!connectRaw
       let registryOverride = normalizeHttpUrl(registryRaw)
       let connectOverride = normalizeHttpUrl(connectRaw)
       if (returnUrl) {
         try {
           const returnHost = new URL(returnUrl)
+          const returnOrigin = returnHost.origin
           if (registryOverride) {
             const regHost = new URL(registryOverride)
-            const ok = hostMatches(regHost, returnHost) || (isLocalHost(regHost.hostname) && isLocalHost(returnHost.hostname))
+            const ok = hostMatches(regHost, returnHost)
+              || sameBaseDomain(regHost.hostname, returnHost.hostname)
             if (!ok) registryOverride = null
           }
           if (connectOverride) {
             const conHost = new URL(connectOverride)
-            const ok = hostMatches(conHost, returnHost) || (isLocalHost(conHost.hostname) && isLocalHost(returnHost.hostname))
+            const ok = hostMatches(conHost, returnHost)
+              || sameBaseDomain(conHost.hostname, returnHost.hostname)
             if (!ok) connectOverride = null
           }
+          if (!registryOverride && !registryRawPresent && returnOrigin) {
+            registryOverride = returnOrigin
+          }
+          if (!connectOverride && !connectRawPresent && returnOrigin) {
+            connectOverride = `${returnOrigin.replace(/\/$/, '')}/connect/pinokio`
+          }
         } catch (_) {}
       } else {
         registryOverride = null
         connectOverride = null
       }
+      console.log("[registry/checkin] repo=%s return=%s registryRaw=%s connectRaw=%s registryOverride=%s connectOverride=%s", repoUrl || "", returnUrl || "", registryRaw || "", connectRaw || "", registryOverride || "", connectOverride || "")
 
       let candidates = []
       if (repoUrl && this.kernel && this.kernel.git) {
@@ -5227,6 +5251,7 @@ class Server {
 	              connectUrl = await this.getRegistryConnectUrl().catch(() => null)
 	            }
 	          }
+	          console.log("[checkpoints/snapshot] publish=1 registryOverride=%s baseUrl=%s connectUrl=%s hasApiKey=%s", registryOverride || "", baseUrl || "", connectUrl || "", apiKey ? "yes" : "no")
 	          if (!baseUrl || !apiKey) {
 	            await this.kernel.git.setCheckpointSync(created.remoteKey, created.id, { status: "needs_link", at: Date.now() }).catch(() => {})
 	            res.json({ ok: true, created: created || null, publish: { ok: false, code: "not_linked", connectUrl } })