pinokiod 5.3.10 → 5.3.12

package/package.json

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

package/server/index.js

@@ -4860,6 +4860,8 @@ class Server {
       const returnRaw = typeof req.query.return === 'string' ? req.query.return.trim() : ''
       const successRaw = typeof req.query.success === 'string' ? req.query.success.trim() : ''
       const appSlug = typeof req.query.app === 'string' ? req.query.app.trim() : ''
+      const registryRaw = typeof req.query.registry === 'string' ? req.query.registry.trim() : ''
+      const connectRaw = typeof req.query.connectUrl === 'string' ? req.query.connectUrl.trim() : ''
       const registryEnabled = await this.isRegistryEnabled().catch(() => false)
 
       let returnUrl = null
@@ -4877,6 +4879,65 @@ class Server {
         } catch (_) {}
       }
 
+      const normalizeHttpUrl = (value) => {
+        if (!value) return null
+        try {
+          const u = new URL(String(value))
+          if (u.protocol !== 'http:' && u.protocol !== 'https:') return null
+          u.hash = ''
+          return u.toString().replace(/\/$/, '')
+        } catch (_) {
+          return null
+        }
+      }
+      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)
+              || sameBaseDomain(regHost.hostname, returnHost.hostname)
+            if (!ok) registryOverride = null
+          }
+          if (connectOverride) {
+            const conHost = new URL(connectOverride)
+            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) {
         const apiRoot = this.kernel.path('api')
@@ -4923,6 +4984,8 @@ class Server {
         returnUrl,
         successUrl,
         registryEnabled: !!registryEnabled,
+        registryOverride,
+        connectOverride,
         candidates,
       }
       const dataJson = JSON.stringify(data).replace(/</g, '\\u003c')
@@ -5150,6 +5213,19 @@ class Server {
         res.json({ ok: false })
         return
       }
+      const normalizeHttpUrl = (value) => {
+        if (!value) return null
+        try {
+          const u = new URL(String(value))
+          if (u.protocol !== 'http:' && u.protocol !== 'https:') return null
+          u.hash = ''
+          return u.toString().replace(/\/$/, '')
+        } catch (_) {
+          return null
+        }
+      }
+      const registryOverride = normalizeHttpUrl(typeof req.query.registry === 'string' ? req.query.registry.trim() : '')
+      const connectOverride = normalizeHttpUrl(typeof req.query.connectUrl === 'string' ? req.query.connectUrl.trim() : '')
       const registryEnabled = await this.isRegistryEnabled().catch(() => false)
       const publishRaw = typeof req.query.publish === 'string' ? req.query.publish.trim().toLowerCase() : ''
       const wantPublish = registryEnabled && (publishRaw === '1' || publishRaw === 'true' || publishRaw === 'cloud')
@@ -5165,9 +5241,17 @@ class Server {
 	      if (created && created.remoteKey && created.id && created.hash) {
 	        if (wantPublish) {
 	          const registry = await this.getRegistryConfig()
-	          const baseUrl = registry && registry.url ? String(registry.url).replace(/\/$/, '') : null
+	          const baseUrl = registryOverride || (registry && registry.url ? String(registry.url).replace(/\/$/, '') : null)
 	          const apiKey = registry && registry.apiKey ? String(registry.apiKey) : null
-	          const connectUrl = await this.getRegistryConnectUrl().catch(() => null)
+	          let connectUrl = connectOverride
+	          if (!connectUrl) {
+	            if (registryOverride) {
+	              connectUrl = `${registryOverride.replace(/\/$/, '')}/connect/pinokio`
+	            } else {
+	              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 } })

package/server/views/registry_checkin.ejs

@@ -129,6 +129,8 @@
 
     <script>
       const data = <%- dataJson %>;
+      const registryOverride = data.registryOverride || null;
+      const connectOverride = data.connectOverride || null;
       const repoEl = document.getElementById('repo');
       const statusEl = document.getElementById('status');
       const pickerEl = document.getElementById('picker');
@@ -258,6 +260,8 @@
         if (cancelBtn) cancelBtn.disabled = true;
         try {
           const qs = new URLSearchParams({ workspace: folder, publish: '1' });
+          if (registryOverride) qs.set('registry', registryOverride);
+          if (connectOverride) qs.set('connectUrl', connectOverride);
           const res = await fetch(`/checkpoints/snapshot?${qs.toString()}`, {
             method: 'POST',
             headers: { 'Accept': 'application/json' }