dsh-enterprise-market 0.2.0 → 0.3.1

package/lib/client.js

@@ -24,6 +24,9 @@ window.__ModuleLoader__.load({
       install: '安装',
       installing: '安装中…',
       installed: '已安装',
+      update: '更新',
+      pendingApproval: '待 npm 批准',
+      updating: '更新中…',
       installedDisabled: '已安装 · 未启用',
       uploader: '上传人',
       unknownUploader: '未记录上传人',
@@ -89,6 +92,9 @@ window.__ModuleLoader__.load({
       install: 'Install',
       installing: 'Installing…',
       installed: 'Installed',
+      update: 'Update',
+      pendingApproval: 'Pending npm approval',
+      updating: 'Updating…',
       installedDisabled: 'Installed · disabled',
       uploader: 'Uploaded by',
       unknownUploader: 'Uploader not recorded',
@@ -286,11 +292,24 @@ window.__ModuleLoader__.load({
             : h('span', null, t('unknownUploader')),
           item.publishedAt ? h('span', null, `${t('updated')} ${relativeTime(item.publishedAt, t)}`) : null,
           item.local ? h('span', { className: 'emk-tag' }, t('local')) : null,
+          item.pendingApproval ? h('span', { className: 'emk-tag' }, t('pendingApproval')) : null,
         ),
         h(
           'div',
           { className: 'emk-actions' },
-          state !== null
+          state !== null && item.updateAvailable
+            ? h(
+                'button',
+                {
+                  className: 'emk-btn emk-btn-primary',
+                  type: 'button',
+                  'data-update': item.name,
+                  disabled: busy,
+                  onClick: () => onInstall(item),
+                },
+                busy ? t('updating') : t('update'),
+              )
+            : state !== null
             ? h('button', { className: 'emk-btn', type: 'button', disabled: true }, state)
             : h(
                 'button',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-enterprise-market",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "private": false,
   "type": "module",
   "description": "TranESS 企业插件市场：员工把自建插件发布到企业 npm 仓库，市场按企业身份显示上传人姓名，同事可直接下载安装。",

package/src/host/catalog.js

@@ -133,6 +133,17 @@ export async function buildCatalog(input) {
       const doc = await readPackument({ registry: input.registry, name, fetchImpl: input.fetchImpl })
       if (doc === null) return
       item.version = doc.latest ?? item.version
+      // 本地回执有、registry 里没有的版本：多半还在暂存区等人工批准。
+      // 这种状态不能显示成“已发布”，也不能拿它当可更新目标。
+      if (
+        item.local === true &&
+        typeof item.localVersion === 'string' &&
+        item.localVersion !== '' &&
+        !(Array.isArray(doc.publishedVersions) && doc.publishedVersions.includes(item.localVersion))
+      ) {
+        item.pendingApproval = true
+        item.updateAvailable = false
+      }
       item.description = item.description ?? doc.manifest?.description ?? null
       item.publishedAt = item.publishedAt ?? isoDay(doc.modified)
       item.uploader = uploaderOf(doc.manifest) ?? item.uploader
@@ -161,9 +172,14 @@ export async function buildCatalog(input) {
   const items = [...byName.values()]
     .map((item) => {
       const state = installed.get(item.name)
+      const installedVersion = 
+        typeof state?.version === 'string' && state.version !== '' ? state.version : null
       return {
         ...item,
         installed: state?.installed === true,
+        installedVersion,
+        updateAvailable:
+          state?.installed === true && versionIsNewer(item.version, installedVersion),
         enabled: state?.enabled === true,
         installedVersion: state?.version ?? null,
       }
@@ -212,3 +228,26 @@ async function mapLimit(items, limit, worker) {
   })
   await Promise.all(runners)
 }
+
+
+/**
+ * 判断仓库里的版本是否比本机已安装的新。只比较点分段数字，预发布后缀不参与；
+ * 任何无法解析的输入一律视为「不更新」，避免误报更新按钮。
+ *
+ * @param {string | null} candidate
+ * @param {string | null} current
+ */
+export function versionIsNewer(candidate, current) {
+  if (typeof candidate !== 'string' || typeof current !== 'string') return false
+  const parse = (value) => value.split('-')[0].split('.').map((part) => Number.parseInt(part, 10))
+  const next = parse(candidate)
+  const have = parse(current)
+  if (next.some((n) => !Number.isFinite(n)) || have.some((n) => !Number.isFinite(n))) return false
+  const length = Math.max(next.length, have.length)
+  for (let index = 0; index < length; index += 1) {
+    const a = next[index] ?? 0
+    const b = have[index] ?? 0
+    if (a !== b) return a > b
+  }
+  return false
+}

package/src/host/npm.js

@@ -294,6 +294,7 @@ export async function readPackument(input) {
   if (manifest === undefined) return null
   return {
     latest,
+    publishedVersions: Object.keys(body?.versions ?? {}),
     manifest,
     modified: typeof body?.time?.modified === 'string' ? body.time.modified : undefined,
   }