pinokiod 7.0.2 → 7.0.3

package/package.json

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

package/server/routes/apps.js

@@ -112,8 +112,43 @@ module.exports = function registerAppRoutes(app, { registry, preferences, appSea
     }
     return `${normalizedAppId}@${host}`
   }
-  const decorateSearchResult = (appResult, source) => {
+  const neutralizeRemoteSearchPreferences = (appResult) => {
     const next = appResult && typeof appResult === 'object' ? { ...appResult } : {}
+    next.starred = false
+    next.starred_at = null
+    next.last_launch_at = null
+    next.last_launch_source = 'unknown'
+    next.launch_count_total = 0
+    next.launch_count_pterm = 0
+    next.launch_count_ui = 0
+    next.preference_boost = 0
+    if (typeof next.score === 'number') {
+      next.adjusted_score = next.score
+    } else {
+      next.adjusted_score = null
+    }
+    return next
+  }
+  const runtimeRank = (appResult) => {
+    if (appResult && appResult.ready) {
+      return 2
+    }
+    if (appResult && appResult.running) {
+      return 1
+    }
+    return 0
+  }
+  const parseTimestamp = (value) => {
+    if (typeof value !== 'string' || !value.trim()) {
+      return 0
+    }
+    const parsed = Date.parse(value)
+    return Number.isFinite(parsed) ? parsed : 0
+  }
+  const decorateSearchResult = (appResult, source) => {
+    const next = source && !source.local
+      ? neutralizeRemoteSearchPreferences(appResult)
+      : (appResult && typeof appResult === 'object' ? { ...appResult } : {})
     next.app_id = qualifyAppId(next.app_id || next.name || '', source.host)
     next.source = source
     if (!source.local) {
@@ -171,11 +206,31 @@ module.exports = function registerAppRoutes(app, { registry, preferences, appSea
     }
     push(localApps)
     push(remoteApps)
-    const normalizedQuery = typeof query === 'string' ? query.trim() : ''
-    if (!normalizedQuery) {
-      return merged
-    }
     return merged.sort((a, b) => {
+      const aRuntimeRank = runtimeRank(a)
+      const bRuntimeRank = runtimeRank(b)
+      if (aRuntimeRank !== bRuntimeRank) {
+        return bRuntimeRank - aRuntimeRank
+      }
+      const normalizedQuery = typeof query === 'string' ? query.trim() : ''
+      if (!normalizedQuery) {
+        const aStarred = a && a.starred ? 1 : 0
+        const bStarred = b && b.starred ? 1 : 0
+        if (aStarred !== bStarred) {
+          return bStarred - aStarred
+        }
+        const aLaunchCount = Math.max(0, Number.parseInt(String(a && a.launch_count_total || 0), 10) || 0)
+        const bLaunchCount = Math.max(0, Number.parseInt(String(b && b.launch_count_total || 0), 10) || 0)
+        if (aLaunchCount !== bLaunchCount) {
+          return bLaunchCount - aLaunchCount
+        }
+        const aLastLaunch = parseTimestamp(a && a.last_launch_at)
+        const bLastLaunch = parseTimestamp(b && b.last_launch_at)
+        if (aLastLaunch !== bLastLaunch) {
+          return bLastLaunch - aLastLaunch
+        }
+        return String(a.app_id || '').localeCompare(String(b.app_id || ''))
+      }
       const aAdjusted = typeof a.adjusted_score === 'number' ? a.adjusted_score : -Infinity
       const bAdjusted = typeof b.adjusted_score === 'number' ? b.adjusted_score : -Infinity
       if (aAdjusted !== bAdjusted) {
@@ -259,6 +314,11 @@ module.exports = function registerAppRoutes(app, { registry, preferences, appSea
       res.status(400).json({ error: 'Invalid app_id' })
       return
     }
+    const parsedAppId = parseQualifiedAppId(appId)
+    if (parsedAppId.qualified && parsedAppId.host !== currentPeerHost()) {
+      res.status(400).json({ error: 'Remote app preferences are not supported' })
+      return
+    }
     const body = req.body && typeof req.body === 'object' ? req.body : {}
     const hasStarred = Object.prototype.hasOwnProperty.call(body, 'starred')
     if (!hasStarred) {