@abtnode/core 1.17.3-beta-20251123-232619-53258789 → 1.17.3-beta-20251126-121502-d0926972

package/lib/blocklet/manager/config-synchronizer.js

@@ -25,7 +25,7 @@ const getValueFromEnvironments = (environments, key) => {
 const isAppObj = (x) => typeof x === 'object' && x !== null && !!x.meta;
 
 class ConfigSynchronizer {
-  constructor({ manager, states, wait = 5000 }) {
+  constructor({ manager, states, wait = 2000 }) {
     this.manager = manager;
     this.wait = wait;
     this.throttles = new Map();
@@ -112,20 +112,54 @@ class ConfigSynchronizer {
     }
   }
 
-  async throttledSyncAppConfig(did) {
+  async throttledSyncAppConfig(did, { wait = this.wait } = {}) {
     if (!this.throttles.has(did)) {
-      this.throttles.set(
-        did,
-        throttle(
-          async () => {
+      let pendingPromise = null;
+      let resolvePending = null;
+      let rejectPending = null;
+
+      const throttledFn = throttle(
+        async () => {
+          try {
             await this.syncAppConfig(did);
-            this.throttles.get(did).cancel();
+            if (resolvePending) {
+              resolvePending();
+              resolvePending = null;
+              rejectPending = null;
+            }
+          } catch (error) {
+            if (rejectPending) {
+              rejectPending(error);
+              resolvePending = null;
+              rejectPending = null;
+            }
+          } finally {
+            throttledFn.cancel();
             this.throttles.delete(did);
-          },
-          this.wait,
-          { leading: false }
-        )
+            pendingPromise = null;
+          }
+        },
+        wait,
+        { leading: false, trailing: true }
       );
+
+      this.throttles.set(did, () => {
+        // 如果已经有待执行的 Promise，返回同一个
+        if (pendingPromise) {
+          return pendingPromise;
+        }
+
+        // 创建新的 Promise
+        pendingPromise = new Promise((resolve, reject) => {
+          resolvePending = resolve;
+          rejectPending = reject;
+        });
+
+        // 调用 throttle 函数
+        throttledFn();
+
+        return pendingPromise;
+      });
     }
     await this.throttles.get(did)();
   }

package/lib/blocklet/manager/disk.js

@@ -868,6 +868,35 @@ class DiskBlockletManager extends BaseBlockletManager {
         )
       );
 
+      // 如果只有 nonEntryComponent，没有 entry component，直接触发 started 事件并返回
+      if (componentDids.length === 0) {
+        const finalBlocklet = await this.getBlocklet(did);
+        await this.configSynchronizer.throttledSyncAppConfig(finalBlocklet);
+        const componentsInfo = getComponentsInternalInfo(finalBlocklet);
+        this.emit(BlockletInternalEvents.componentUpdated, {
+          appDid: blocklet.appDid,
+          components: componentsInfo,
+        });
+        this.emit(BlockletInternalEvents.componentStarted, {
+          appDid: blocklet.appDid,
+          components: nonEntryComponentIds.map((x) => ({ did: x })),
+        });
+        this.emit(BlockletEvents.statusChange, finalBlocklet);
+        this.emit(BlockletEvents.started, { ...finalBlocklet, componentDids: nonEntryComponentIds });
+        launcher.notifyBlockletStarted(finalBlocklet);
+
+        // 根据情况更新 route table
+        if (!['true', '1'].includes(process.env.ABT_NODE_DISABLE_BLUE_GREEN)) {
+          this.emit(BlockletEvents.blurOrGreenStarted, {
+            blocklet: finalBlocklet,
+            componentDids: inputComponentDids,
+            context,
+          });
+        }
+
+        return finalBlocklet;
+      }
+
       const doc1 = await states.blocklet.setBlockletStatus(did, BlockletStatus.starting, {
         componentDids,
         operator,
@@ -930,19 +959,25 @@ class DiskBlockletManager extends BaseBlockletManager {
         const finalBlocklet = await this.getBlocklet(did);
         resultBlocklet = finalBlocklet;
 
-        await this.configSynchronizer.throttledSyncAppConfig(finalBlocklet);
+        await this.configSynchronizer.throttledSyncAppConfig(finalBlocklet, { wait: 200 });
         const componentsInfo = getComponentsInternalInfo(finalBlocklet);
         this.emit(BlockletInternalEvents.componentUpdated, {
           appDid: blocklet.appDid,
           components: componentsInfo,
         });
+
+        const allStartedComponentDids = uniq([
+          ...(componentDids || []),
+          ...nonEntryComponentIds,
+          ...startedBlockletDids.map((x) => x.did),
+        ]);
         this.emit(BlockletInternalEvents.componentStarted, {
           appDid: blocklet.appDid,
-          components: (componentDids || []).map((x) => ({ did: x })),
+          components: allStartedComponentDids.map((x) => ({ did: x })),
         });
 
         this.emit(BlockletEvents.statusChange, finalBlocklet);
-        this.emit(BlockletEvents.started, { ...finalBlocklet, componentDids });
+        this.emit(BlockletEvents.started, { ...finalBlocklet, componentDids: allStartedComponentDids });
 
         launcher.notifyBlockletStarted(finalBlocklet);
       }