heluxjs · fantasticsoul · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024 · Jun 20, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 click helux-core [change log](./packages/helux-core/CHANGELOG.md) to see more details
 
+[released] - 2024-06-20
+
+relese `4.3.6` to fix server mem leak( add `RUN_AT_SERVER` judgement)
+
 [released] - 2024-01-16
 
 - fix issue [136](https://github.com/heluxjs/helux/issues/136)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "helux",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "A reactive atomic state engine for React like.",
   "keywords": [],
   "author": {

diff --git a/packages/helux-core/CHANGELOG.md b/packages/helux-core/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @helux/core
 
+## 4.3.6
+
+### Patch Changes
+
+- f014aae: build(4.3.6): add RUN_AT_SERVER judgement
+- Updated dependencies [f014aae]
+  - @helux/hooks-impl@4.3.6
+  - @helux/types@4.3.6
+  - @helux/utils@4.3.6
+
 ## 4.3.5
 
 ### Patch Changes

diff --git a/packages/helux-core/package.json b/packages/helux-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helux/core",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "A reactive atomic state engine for React like.",
   "bugs": {
     "url": "https://github.com/heluxjs/helux/issues"

diff --git a/packages/helux-core/src/consts/index.ts b/packages/helux-core/src/consts/index.ts
@@ -7,6 +7,10 @@ export const PROTO_KEY = '__proto__';
 
 export const HAS_PROXY = isProxyAvailable();
 
+// export const RUN_AT_SERVER = isServer();
+export const RUN_AT_SERVER = false;
+// export const RUN_AT_SERVER = true;
+
 /** 提供给 sync 返回 undefined 时之用 */
 export const UNDEFINED = createSymbol('HeluxUndefined');
 

diff --git a/packages/helux-core/src/consts/user.ts b/packages/helux-core/src/consts/user.ts
@@ -1,6 +1,6 @@
 import { VER as limuVer } from 'limu';
 
-export const VER = '4.3.5';
+export const VER = '4.3.6';
 
 export const LIMU_VER = limuVer;
 

diff --git a/packages/helux-core/src/factory/common/ctor.ts b/packages/helux-core/src/factory/common/ctor.ts
@@ -138,7 +138,7 @@ export function newMutateFnItem(partial?: Partial<IMutateFnStdItem>): IMutateFnS
 
 export function newFnCtx() {
   const base: IFnCtx = {
-    fnKey: '', // 在 feDep.mapFn 阶段会生成
+    fnKey: '', // 在 fnDep.mapFn 阶段会生成
     fn: noop,
     subFnInfo: fnItem,
     checkDeadCycle: true,

diff --git a/packages/helux-core/src/factory/common/derived.ts b/packages/helux-core/src/factory/common/derived.ts
@@ -174,7 +174,7 @@ export function initDeriveFn(options: IInitDeriveFnOptions) {
   // 第一次调用时，如未显示定义 immediate 值，则触发规律是没有 fn 则执行，有 fn 则不执行
   const canRunTask = runAsync && asyncType === TASK && (immediate ?? !options.fn);
   if (task && canRunTask) {
-    runFn(curFnKey, { isFirstCall: true, sn: fnCtx.renderInfo.sn + 1 })
+    runFn(curFnKey, { isFirstCall: true, sn: fnCtx.renderInfo.sn + 1, throwErr: true })
       .then((data: [any, Error | null]) => {
         checkResult(fnCtx, data[0], forAtom);
       })

diff --git a/packages/helux-core/src/factory/creator/globalId.ts b/packages/helux-core/src/factory/creator/globalId.ts
@@ -1,5 +1,5 @@
 import { delListItem, nodupPush, safeMapGet } from '@helux/utils';
-import { STATE_TYPE } from '../../consts';
+import { RUN_AT_SERVER, STATE_TYPE } from '../../consts';
 import { getInternal } from '../../helpers/state';
 import type { CoreApiCtx } from '../../types/api-ctx';
 import type { Fn, NumStrSymbol } from '../../types/base';
@@ -37,7 +37,8 @@ export function getGlobalEmptyInternal() {
 }
 
 export function mapGlobalId(id: NumStrSymbol, insKey: number) {
-  if (!id) return;
+  // 服务端运行时，不做 globalId 映射，避免内存浪费
+  if (!id || RUN_AT_SERVER) return;
   const keys = getGlobalIdInsKeys(id);
   nodupPush(keys, insKey);
 }

diff --git a/packages/helux-core/src/factory/creator/operateState.ts b/packages/helux-core/src/factory/creator/operateState.ts
@@ -61,8 +61,9 @@ export function handleOperate(opParams: IOperateParams, opts: { internal: TInter
       if (currReactive.onRead) {
         currReactive.onRead(opParams);
       } else {
+        const runingFnCtx = getRunningFn().fnCtx;
         // 支持对 draft 操作时可以收集到依赖： draft.a = draft.b + 1
-        if (getRunningFn().fnCtx) {
+        if (runingFnCtx) {
           recordFnDepKeys([depKey], { sharedKey });
         }
         // 仅 top reactive 触发以下逻辑，为 block 收集依赖

diff --git a/packages/helux-core/src/helpers/blockCtx.ts b/packages/helux-core/src/helpers/blockCtx.ts
@@ -1,3 +1,4 @@
+import { RUN_AT_SERVER } from '../consts';
 import { getBlockCtxMap } from '../factory/common/blockScope';
 import { genBlockKey } from '../factory/common/key';
 import { getBlockScope } from '../factory/common/speedup';
@@ -30,7 +31,12 @@ export function initBlockCtx(isDynamic: boolean, enableStatus = false) {
   }
   const blockKey = genBlockKey();
   const blockCtx = newBlockCtx(blockKey, enableStatus);
-  getBlockCtxMap(isDynamic).set(blockKey, blockCtx);
+
+  // 非服务器端执行才记录 blockCtx ，避免内存泄露
+  if (!RUN_AT_SERVER) {
+    getBlockCtxMap(isDynamic).set(blockKey, blockCtx);
+  }
+
   return blockCtx;
 }
 

diff --git a/packages/helux-core/src/helpers/fnCtx.ts b/packages/helux-core/src/helpers/fnCtx.ts
@@ -1,4 +1,5 @@
 import { delListItem, includeOne, matchDictKey, nodupPush } from '@helux/utils';
+import { RUN_AT_SERVER } from '../consts';
 import { newFnCtx } from '../factory/common/ctor';
 import { getCtxMap, getFnCtx, getFnKey, markFnKey } from '../factory/common/fnScope';
 import { getFnScope } from '../factory/common/speedup';
@@ -78,7 +79,14 @@ export function registerFn(fn: Fn, options: { specificProps: Partial<IFnCtx> & {
   const props = { fn, fnKey, ...specificProps };
   // 如 fnCtxBase 存在则 fnCtx 指向用户透传的 fnCtxBase
   const fnCtx = fnCtxBase ? Object.assign(fnCtxBase, props) : buildFnCtx(props);
-  getCtxMap(scopeType).set(fnKey, fnCtx);
+
+  // static 调用派生时始终记录 fnCtx
+  // hook 调用派生时仅在非服务器端执行才记录 fnCtx ，避免内存泄露
+  if (scopeType === 'static' || !RUN_AT_SERVER) {
+    // debugger;
+    getCtxMap(scopeType).set(fnKey, fnCtx);
+  }
+
   return fnCtx;
 }
 

diff --git a/packages/helux-core/src/helpers/fnDep.ts b/packages/helux-core/src/helpers/fnDep.ts
@@ -1,5 +1,5 @@
 import { nodupPush, safeMapGet } from '@helux/utils';
-import { DERIVE, EXPIRE_MS, NOT_MOUNT, PROTO_KEY, SIZE_LIMIT, UNMOUNT } from '../consts';
+import { DERIVE, EXPIRE_MS, NOT_MOUNT, PROTO_KEY, RUN_AT_SERVER, SIZE_LIMIT, UNMOUNT } from '../consts';
 import { delFnDepData, getFnCtx, getRunningFn, opUpstreamFnKey } from '../factory/common/fnScope';
 import { hasChangedNode } from '../factory/common/sharedScope';
 import { getFnScope } from '../factory/common/speedup';
@@ -24,6 +24,12 @@ export function recordFnDepKeys(inputDepKeys: string[], options: { sharedKey?: n
     DEPS_CB.current()(inputDepKeys);
     return;
   }
+  const { fnKey, scopeType } = fnCtx;
+  // 服务端运行的话，不记录任何 hook 实例对应的相关映射关系，避免不必要的服务端内存开销
+  if (RUN_AT_SERVER && scopeType === 'hook') {
+    return;
+  }
+
   const { DEPKEY_FNKEYS_MAP, SKEY_FNKEYS_MAP } = getFnScope();
   const { belongCtx, sharedKey } = options;
 
@@ -42,7 +48,6 @@ export function recordFnDepKeys(inputDepKeys: string[], options: { sharedKey?: n
     nodupPush(belongCtx.nextLevelFnKeys, runningFnCtx.fnKey);
   }
 
-  const { fnKey } = fnCtx;
   inputDepKeys.forEach((depKey: string) => {
     if (PROTO_KEY === depKey || isIgnore) {
       return;
@@ -70,6 +75,8 @@ export function ensureFnDepData(fnCtx?: IFnCtx) {
 /** TODO 后续接入内置 useEffect 后，这里可考虑移除 */
 export function recoverDep(fnCtx: IFnCtx) {
   const { FNKEY_HOOK_CTX_MAP, UNMOUNT_INFO_MAP } = getFnScope();
+  if (RUN_AT_SERVER) return;
+
   const { fnKey } = fnCtx;
   FNKEY_HOOK_CTX_MAP.set(fnKey, fnCtx);
   opUpstreamFnKey(fnCtx, true);

diff --git a/packages/helux-core/src/helpers/insCtx.ts b/packages/helux-core/src/helpers/insCtx.ts
@@ -1,6 +1,6 @@
 import { delListItem, enureReturnArr, isFn, isSymbol, nodupPush, prefixValKey, warn } from '@helux/utils';
 import { immut } from 'limu';
-import { DICT, EXPIRE_MS, IS_DERIVED_ATOM, NOT_MOUNT, OTHER, RENDER_END, RENDER_START } from '../consts';
+import { DICT, EXPIRE_MS, IS_DERIVED_ATOM, NOT_MOUNT, OTHER, RENDER_END, RENDER_START, RUN_AT_SERVER } from '../consts';
 import { newOpParams } from '../factory/common/ctor';
 import { hasRunningFn } from '../factory/common/fnScope';
 import { genInsKey } from '../factory/common/key';
@@ -65,6 +65,8 @@ export function attachInsProxyState(insCtx: InsCtxDef) {
   const { rawState, isDeep, sharedKey, onRead, forAtom } = internal;
   if (isDeep) {
     const onOperate: OnOperate = (opParams) => {
+      // 服务端执行，无需记录依赖关系
+      if (RUN_AT_SERVER) return;
       const { isBuiltInFnKey, key } = opParams;
       if (isBuiltInFnKey) return;
       if (isSymbol(key)) {
@@ -99,6 +101,8 @@ export function attachInsProxyState(insCtx: InsCtxDef) {
         return true;
       },
       get: (target: Dict, key: string) => {
+        // 服务端执行，无需记录依赖关系
+        if (RUN_AT_SERVER) return;
         const value = target[key];
         if (isSymbol(key)) {
           return handleHeluxKey(true, forAtom, sharedKey, key, value);
@@ -252,8 +256,15 @@ export function buildInsCtx(options: Ext<IInnerUseSharedOptions>): InsCtxDef {
       }
     },
   };
+
   globalId && mapGlobalId(globalId, insKey);
   attachInsProxyState(insCtx);
+
+  // 是服务器端执行的话，不需要真正的去映射实例和共享状态关系，避免内存泄露
+  if (RUN_AT_SERVER) {
+    return insCtx;
+  }
+
   internal.mapInsCtx(insCtx, insKey);
   internal.recordId(id, insKey);
 
@@ -281,7 +292,7 @@ export function buildInsCtx(options: Ext<IInnerUseSharedOptions>): InsCtxDef {
 export function attachInsDerivedResult(fnCtx: IFnCtx) {
   const { result, forAtom } = fnCtx;
 
-  // MARK: 此计算结果不具备依赖收集特性，如需要此特性可使用 share接口的 mutate 配置可变派生结果
+  // MARK: 此计算结果不具备依赖收集特性，如需要此特性可使用 share 接口的 mutate 配置可变派生结果
   // LABEL: proxyResult
   fnCtx.proxyResult = createOb(result, {
     set: () => {
@@ -292,7 +303,8 @@ export function attachInsDerivedResult(fnCtx: IFnCtx) {
       if (IS_DERIVED_ATOM === resultKey) {
         return forAtom;
       }
-      if (RENDER_START === fnCtx.renderStatus) {
+      // 服务端运行时，就不需要记录hook使用导出结果时的相关映射关系了，避免内存浪费
+      if (RENDER_START === fnCtx.renderStatus && !RUN_AT_SERVER) {
         fnDep.ensureFnDepData(fnCtx);
       }
       return result[resultKey];

diff --git a/packages/helux-core/src/helpers/state.ts b/packages/helux-core/src/helpers/state.ts
@@ -1,5 +1,5 @@
 import { getSafeNext, warn } from '@helux/utils';
-import { SHARED_KEY } from '../consts';
+import { RUN_AT_SERVER, SHARED_KEY } from '../consts';
 import { getInternalMap } from '../factory/common/internal';
 import { getSharedScope } from '../factory/common/speedup';
 import type { TInternal } from '../factory/creator/buildInternal';
@@ -76,6 +76,11 @@ export function getSharedState(sharedKey: number) {
 }
 
 export function recordMod(sharedState: Dict, options: ParsedOptions) {
+  // 服务端运行，没必要记录模块信息到 global 上，避免服务端内存浪费、冗余的模块重复信息提示（nextjs里同一个地方的share代码会被多次调用）
+  if (RUN_AT_SERVER) {
+    return;
+  }
+
   const { rootState, ctx } = getRoot();
   const { moduleName, usefulName } = options;
   const existedShared = rootState[usefulName];

diff --git a/packages/helux-core/src/hooks/common/derived.ts b/packages/helux-core/src/hooks/common/derived.ts
@@ -61,10 +61,9 @@ export function genDerivedResult(deriveCtx: IDeriveCtx, options: IUseDerivedLogi
     const isChanged = isInputChanged(fnCtx, input, result);
     if (!isChanged) {
       return;
-    } else {
-      isCtxChanged = true;
-      ensureHotReload(fnCtx);
     }
+    isCtxChanged = true;
+    ensureHotReload(fnCtx);
   }
 
   deriveCtx.input = result;

diff --git a/packages/helux-core/src/hooks/common/useAtomLogic.ts b/packages/helux-core/src/hooks/common/useAtomLogic.ts
@@ -1,4 +1,4 @@
-import { Fn } from 'helux';
+import type { Fn } from 'helux';
 import { RENDER_END, RENDER_START } from '../../consts';
 import type { InsCtxDef } from '../../factory/creator/buildInternal';
 import { INS_CTX } from '../../factory/creator/current';

diff --git a/packages/helux-core/src/types/api.d.ts b/packages/helux-core/src/types/api.d.ts
@@ -68,7 +68,7 @@ import type {
 } from './base';
 
 export declare const cst: {
-  VER: '4.3.5';
+  VER: '4.3.6';
   LIMU_VER: string;
   EVENT_NAME: {
     /** 共享状态创建时的事件 */

diff --git a/packages/helux-demo-utils/package.json b/packages/helux-demo-utils/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@types/react": ">=16.0.0",
     "@types/react-dom": ">=16.0.0",
-    "helux": "^4.3.5",
+    "helux": "^4.3.6",
     "react": ">=16.10.2",
     "react-dom": ">=16.10.2"
   },

diff --git a/packages/helux-hooks-impl/CHANGELOG.md b/packages/helux-hooks-impl/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @helux/hooks-impl
 
+## 4.3.6
+
+### Patch Changes
+
+- f014aae: build(4.3.6): add RUN_AT_SERVER judgement
+- Updated dependencies [f014aae]
+  - @helux/types@4.3.6
+  - @helux/utils@4.3.6
+
 ## 4.3.5
 
 ### Patch Changes

diff --git a/packages/helux-hooks-impl/package.json b/packages/helux-hooks-impl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helux/hooks-impl",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "helux hooks implement lib",
   "bugs": {
     "url": "https://github.com/heluxjs/helux/issues"

diff --git a/packages/helux-hooks/CHANGELOG.md b/packages/helux-hooks/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @helux/hooks
 
+## 4.3.6
+
+### Patch Changes
+
+- f014aae: build(4.3.6): add RUN_AT_SERVER judgement
+- Updated dependencies [f014aae]
+  - @helux/hooks-impl@4.3.6
+  - @helux/types@4.3.6
+  - @helux/utils@4.3.6
+
 ## 4.3.5
 
 ### Patch Changes

diff --git a/packages/helux-hooks/package.json b/packages/helux-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helux/hooks",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "helux hooks lib for react",
   "keywords": [
     "helux",

diff --git a/packages/helux-openinula/CHANGELOG.md b/packages/helux-openinula/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @helux/openinula
 
+## 4.3.6
+
+### Patch Changes
+
+- f014aae: build(4.3.6): add RUN_AT_SERVER judgement
+- Updated dependencies [f014aae]
+  - @helux/core@4.3.6
+
 ## 4.3.5
 
 ### Patch Changes

diff --git a/packages/helux-openinula/package.json b/packages/helux-openinula/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helux/openinula",
-  "version": "4.3.5",
+  "version": "4.3.6",
   "description": "State library for preact that integrates atom, signal, collection dep, derive and watch.",
   "bugs": {
     "url": "https://github.com/heluxjs/helux/issues"

diff --git a/packages/helux-plugin-devtool/package.json b/packages/helux-plugin-devtool/package.json
@@ -31,7 +31,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "helux": "^4.3.5",
+    "helux": "^4.3.6",
     "redux": "^4.2.1"
   },
   "devDependencies": {

diff --git a/packages/helux-types/CHANGELOG.md b/packages/helux-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @helux/types
 
+## 4.3.6
+
+### Patch Changes
+
+- f014aae: build(4.3.6): add RUN_AT_SERVER judgement
+
 ## 4.3.5
 
 ### Patch Changes