vome-core 0.0.6 → 0.0.9

package/src/admin/service/index.ts

@@ -1,8 +1,63 @@
 import { loadEps } from '../lib/eps'
 import { BaseService } from './base'
+
 const SIDE_ID = 'admin'
 
-/** EPS 不可用时仍保证业务页链式可调 */
+/**
+ * 每次发版递增。globalThis 单例若跨 HMR/旧包残留，靠此戳强制换新根对象并重建。
+ * 根因：旧 singleton 只有 CRUD、无 tree/roleMap，且 plugin-info 错名导致 base.plugin 缺失。
+ */
+const SERVICE_BUILD = 9
+
+/** 标准 CRUD 之外的常用接口（不依赖 EPS 是否已返回） */
+const FALLBACK_EXTRA_APIS: Record<
+  string,
+  Array<{ method: string; path: string; perms?: string[] }>
+> = {
+  '/admin/base/department': [{ method: 'get', path: '/tree' }],
+  '/admin/base/menu': [{ method: 'get', path: '/tree' }],
+  '/admin/base/role': [
+    { method: 'get', path: '/menus' },
+    { method: 'post', path: '/setMenus' },
+    { method: 'get', path: '/departments' },
+    { method: 'post', path: '/setDepartments' },
+  ],
+  '/admin/base/user': [
+    { method: 'get', path: '/roles' },
+    { method: 'get', path: '/roleMap' },
+    { method: 'post', path: '/setRoles' },
+    { method: 'post', path: '/transferSuper' },
+    { method: 'post', path: '/moveDepartment' },
+  ],
+  '/admin/base/task': [
+    { method: 'post', path: '/start' },
+    { method: 'post', path: '/stop' },
+    { method: 'post', path: '/once' },
+    { method: 'get', path: '/log' },
+  ],
+  '/admin/base/log': [
+    { method: 'post', path: '/clear' },
+    { method: 'post', path: '/setKeep' },
+    { method: 'post', path: '/getKeep' },
+  ],
+  '/admin/base/dict/info': [
+    { method: 'get', path: '/types' },
+    { method: 'post', path: '/data' },
+    { method: 'post', path: '/get' },
+    { method: 'post', path: '/find' },
+    { method: 'post', path: '/getValues' },
+    { method: 'post', path: '/pathValue' },
+    { method: 'post', path: '/childValue' },
+  ],
+  '/admin/base/module': [{ method: 'post', path: '/install' }],
+  '/admin/base/comm': [{ method: 'post', path: '/upload' }],
+  '/admin/user/info': [
+    { method: 'get', path: '/roles' },
+    { method: 'get', path: '/roleMap' },
+    { method: 'post', path: '/setRoles' },
+  ],
+}
+
 const FALLBACK_PREFIXES = [
   '/admin/base/menu',
   '/admin/base/user',
@@ -11,8 +66,13 @@ const FALLBACK_PREFIXES = [
   '/admin/base/tenant',
   '/admin/base/task',
   '/admin/base/log',
-  '/admin/base/plugin-info',
-  '/admin/user/user-role',
+  '/admin/base/plugin',
+  '/admin/base/dict/info',
+  '/admin/base/dict/type',
+  '/admin/base/module',
+  '/admin/base/comm',
+  '/admin/user/info',
+  '/admin/user/role',
 ]
 
 function toCamel(str: string) {
@@ -27,10 +87,8 @@ function isValidName(name: string) {
   return Boolean(name) && !['{', '}', ':'].some((c) => name.includes(c))
 }
 
-/** 无 EPS perms 时生成权限码 */
 function resolvePermCode(prefix: string, action: string) {
   const parts = prefix.replace(/^\//, '').split('/').filter(Boolean)
-  // admin / module / resource...
   const module = parts[1] || parts[0] || 'base'
   let resource = parts.slice(2).join(':')
   if (resource === module) {
@@ -45,20 +103,16 @@ function resolvePermCode(prefix: string, action: string) {
   return `${module}:${resource}:${action}`
 }
 
-function getMethodKeys(leaf: Record<string, unknown>) {
-  return Object.keys(leaf).filter(
-    (k) => !['namespace', 'permission', '_permission', 'request', 'search'].includes(k),
-  )
+function prefixToParts(prefix: string) {
+  const raw = prefix.replace(/^\//, '')
+  return raw
+    .replace(new RegExp(`^${SIDE_ID}/?`), '')
+    .split('/')
+    .filter(Boolean)
+    .map(toCamel)
 }
 
-function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
-  const base = new BaseService(namespace)
-  const leaf = base as unknown as ServiceLeaf
-  leaf.namespace = namespace.replace(/^\//, '')
-  leaf.permission = {}
-  leaf._permission = {}
-
-  // 挂到实例自身，避免业务侧 `...leaf` 丢失原型方法
+function bindCrud(leaf: ServiceLeaf, base: BaseService) {
   const proto = BaseService.prototype as unknown as Record<string, unknown>
   for (const name of [
     'request',
@@ -72,15 +126,23 @@ function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
   ]) {
     const fn = proto[name]
     if (typeof fn === 'function') {
-      ;(leaf as Record<string, unknown>)[name] = (fn as (...a: unknown[]) => unknown).bind(base)
+      ;(leaf as Record<string, unknown>)[name] = (
+        fn as (...a: unknown[]) => unknown
+      ).bind(base)
     }
   }
+}
 
+function bindApis(leaf: ServiceLeaf, base: BaseService, apis: EpsApiItem[]) {
+  leaf.permission ||= {}
   for (const api of apis) {
     const name = methodName(api.path)
     if (!isValidName(name) || /[-:]/g.test(name)) continue
     const method = (api.method || 'get').toLowerCase()
-    leaf[name] = function (this: BaseService, data?: unknown) {
+    ;(leaf as Record<string, unknown>)[name] = function (
+      this: BaseService,
+      data?: unknown,
+    ) {
       return this.request({
         url: api.path.startsWith('/') ? api.path : `/${api.path}`,
         method,
@@ -90,25 +152,57 @@ function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
     leaf.permission[name] =
       api.perms?.[0] || resolvePermCode(`/${leaf.namespace}`, name)
   }
+}
 
-  // 标准 CRUD 权限兜底（EPS 未列时仍有码）
-  for (const name of getMethodKeys(leaf as unknown as Record<string, unknown>)) {
-    if (!leaf.permission[name]) {
-      leaf.permission[name] = resolvePermCode(`/${leaf.namespace}`, name)
+/** 原地重挂方法，保持叶子对象引用不变（避免页面 const log = service.base.log 失效） */
+function remountLeaf(leaf: ServiceLeaf, namespace: string, apis: EpsApiItem[]) {
+  const ns = namespace.replace(/^\//, '')
+  const base = new BaseService(ns)
+  leaf.namespace = ns
+  leaf.permission = {}
+  leaf._permission = leaf._permission || {}
+
+  // 清掉旧方法再绑，避免残留错误实现
+  for (const key of Object.keys(leaf as object)) {
+    if (
+      key === 'namespace' ||
+      key === 'permission' ||
+      key === '_permission' ||
+      key === 'search'
+    ) {
+      continue
     }
+    delete (leaf as Record<string, unknown>)[key]
   }
 
+  bindCrud(leaf, base)
+  bindApis(leaf, base, apis)
+
+  for (const name of Object.keys(leaf.permission)) {
+    if (leaf._permission[name] == null) leaf._permission[name] = false
+  }
   return leaf
 }
 
-function attachLeaf(tree: ServiceTree | Eps.Service, prefix: string, apis: EpsApiItem[] = []) {
-  const raw = prefix.replace(/^\//, '')
-  const arr = raw
-    .replace(new RegExp(`^${SIDE_ID}/?`), '')
-    .split('/')
-    .filter(Boolean)
-    .map(toCamel)
+function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
+  const ns = namespace.replace(/^\//, '')
+  const base = new BaseService(ns)
+  const leaf = base as unknown as ServiceLeaf
+  leaf.namespace = ns
+  leaf.permission = {}
+  leaf._permission = {}
+  bindCrud(leaf, base)
+  bindApis(leaf, base, apis)
+  return leaf
+}
 
+function attachLeaf(
+  tree: ServiceTree | Eps.Service,
+  prefix: string,
+  apis: EpsApiItem[] = [],
+) {
+  const raw = prefix.replace(/^\//, '')
+  const arr = prefixToParts(prefix)
   if (!arr.length) return undefined
 
   let node: Record<string, unknown> = tree as unknown as Record<string, unknown>
@@ -116,16 +210,18 @@ function attachLeaf(tree: ServiceTree | Eps.Service, prefix: string, apis: EpsAp
     const key = arr[i]!
     const isLast = i === arr.length - 1
     if (!isLast) {
-      if (!node[key] || typeof node[key] !== 'object') node[key] = {}
+      const cur = node[key] as ServiceLeaf | Record<string, unknown> | undefined
+      // 中间节点若被误建成叶子，换成容器（否则 dict/info 挂不上）
+      if (!cur || typeof cur !== 'object' || 'namespace' in cur) {
+        node[key] = {}
+      }
       node = node[key] as Record<string, unknown>
       continue
     }
+
     const existing = node[key] as ServiceLeaf | undefined
-    if (existing?.namespace) {
-      // 已有叶子：补方法
-      const next = createLeaf(raw, apis)
-      Object.assign(existing, next)
-      return existing
+    if (existing && typeof existing === 'object' && existing.namespace) {
+      return remountLeaf(existing, raw, apis)
     }
     const leaf = createLeaf(raw, apis)
     node[key] = leaf
@@ -154,41 +250,87 @@ function buildFromEps(map: EpsModuleMap) {
   }
 }
 
+function extraApisOf(prefix: string): EpsApiItem[] {
+  return (FALLBACK_EXTRA_APIS[prefix] || []).map(
+    (a) =>
+      ({
+        method: a.method,
+        path: a.path,
+        perms: a.perms,
+      }) as EpsApiItem,
+  )
+}
+
+/**
+ * 用 fallback 补全：已有叶子则合并补方法（不整棵删，避免打断引用）。
+ * 对 fallback 前缀：若 EPS 已挂过，只补缺失的 extra；attachLeaf/remount 会重绑整叶。
+ */
 function buildFallback() {
   for (const prefix of FALLBACK_PREFIXES) {
-    const path = prefix.replace(/^\//, '')
-    const arr = path
-      .replace(new RegExp(`^${SIDE_ID}/?`), '')
-      .split('/')
-      .filter(Boolean)
-      .map(toCamel)
+    const parts = prefixToParts(prefix)
     let node: Record<string, unknown> = service as unknown as Record<string, unknown>
-    let exists = true
-    for (let i = 0; i < arr.length; i++) {
-      const key = arr[i]!
+    let missing = false
+    for (let i = 0; i < parts.length; i++) {
+      const key = parts[i]!
       if (!node[key]) {
-        exists = false
+        missing = true
         break
       }
-      node = node[key] as Record<string, unknown>
+      if (i < parts.length - 1) {
+        node = node[key] as Record<string, unknown>
+      }
     }
-    if (!exists || !(node as ServiceLeaf).namespace) {
-      attachLeaf(service, prefix)
+    const leaf = missing
+      ? undefined
+      : (node[parts[parts.length - 1]!] as ServiceLeaf | undefined)
+
+    if (leaf?.namespace) {
+      // 只补 extra 里还没有的方法，保留 EPS 已绑方法
+      const extras = extraApisOf(prefix).filter((api) => {
+        const name = methodName(api.path)
+        return typeof (leaf as Record<string, unknown>)[name] !== 'function'
+      })
+      if (extras.length) {
+        const base = new BaseService(leaf.namespace)
+        bindApis(leaf, base, extras)
+      }
+      continue
     }
+    attachLeaf(service, prefix, extraApisOf(prefix))
   }
 }
 
-const root = new BaseService()
+type ServiceRoot = Eps.Service & { request: BaseService['request'] }
+
+const g = globalThis as typeof globalThis & {
+  __vome_admin_service__?: ServiceRoot
+  __vome_admin_service_build__?: number
+}
+
+function createServiceRoot(): ServiceRoot {
+  const root = new BaseService()
+  return {
+    request: root.request.bind(root),
+  } as ServiceRoot
+}
+
+function getOrCreateRoot(): ServiceRoot {
+  if (
+    !g.__vome_admin_service__ ||
+    g.__vome_admin_service_build__ !== SERVICE_BUILD
+  ) {
+    g.__vome_admin_service__ = createServiceRoot()
+    g.__vome_admin_service_build__ = SERVICE_BUILD
+  }
+  return g.__vome_admin_service__
+}
 
 /** 全局链式 service（service.base.user.page()） */
-export const service = {
-  request: root.request.bind(root),
-} as unknown as Eps.Service
+export const service: ServiceRoot = getOrCreateRoot()
 
-// 同步兜底，保证页面 import 时即可 service.base.xxx
 buildFallback()
 
-/** 从 EPS 构建/刷新 service 树；失败时用兜底 prefix */
+/** 从 EPS 构建/刷新；再 fallback 补自定义方法 */
 export async function createEps(force = false) {
   try {
     const map = (await loadEps(force)) || {}
@@ -200,7 +342,6 @@ export async function createEps(force = false) {
   return service
 }
 
-// Vite 保存源码 / 刷新时：插件重拉 EPS 后通知客户端热更新 service 树
 if (import.meta.hot) {
   import.meta.hot.on('eps-update', () => {
     void createEps(true).then(() => {
@@ -209,7 +350,6 @@ if (import.meta.hot) {
   })
 }
 
-/** 登录后写入 _permission，供 CRUD / 按钮显隐 */
 export function setServicePerms(perms: string[], isSuper = false) {
   const list = perms || []
 
@@ -243,7 +383,6 @@ export function setServicePerms(perms: string[], isSuper = false) {
   deep(service)
 }
 
-/** 解析 service.base.user 或 'base.user' */
 export function resolveService(path: string): ServiceLeaf | undefined {
   const parts = path.replace(/^\//, '').split('.').filter(Boolean)
   let cur: unknown = service
@@ -257,19 +396,12 @@ export function resolveService(path: string): ServiceLeaf | undefined {
   return undefined
 }
 
-/** 按 prefix 取或创建 service 叶子 */
 export function serviceOf(prefix: string): ServiceLeaf {
   const raw = prefix.replace(/\/$/, '')
-  const path = raw
-    .replace(/^\//, '')
-    .replace(new RegExp(`^${SIDE_ID}/?`), '')
-    .split('/')
-    .filter(Boolean)
-    .map(toCamel)
-    .join('.')
+  const path = prefixToParts(raw).join('.')
   const hit = resolveService(path)
   if (hit) return hit
-  return attachLeaf(service, raw) as ServiceLeaf
+  return attachLeaf(service, raw, extraApisOf(raw.startsWith('/') ? raw : `/${raw}`)) as ServiceLeaf
 }
 
 /** @deprecated 请用 service.base.xxx */