@netless/window-manager 0.4.39 → 0.4.40

package/src/App/AppProxy.ts

@@ -188,6 +188,7 @@ export class AppProxy implements PageRemoveService {
                 this.setViewFocusScenePath();
                 setTimeout(async () => {
                     // 延迟执行 setup, 防止初始化的属性没有更新成功
+                    console.log("setup app", app);
                     const result = await app.setup(context);
                     this.appResult = result;
                     appRegister.notifyApp(this.kind, "created", { appId, result });

package/src/Register/index.ts

@@ -32,18 +32,23 @@ class AppRegister {
         this.registered.set(params.kind, params);
 
         const paramSrc = params.src;
-        let srcOrAppOrFunction: () => Promise<NetlessApp>;
         let downloadApp: () => Promise<NetlessApp>;
 
         if (typeof paramSrc === "string") {
-            srcOrAppOrFunction = () => loadApp(paramSrc, params.kind, params.name);
+            downloadApp = async () => {
+                const result = await loadApp(paramSrc, params.kind, params.name) as any;
+                if (result.__esModule) {
+                    return result.default;
+                }
+                return result;
+            };
             if (this.syncRegisterApp) {
                 this.syncRegisterApp({ kind: params.kind, src: paramSrc, name: params.name });
             }
         }
         if (typeof paramSrc === "function") {
             downloadApp = async () => {
-                let appClass = await srcOrAppOrFunction() as any;
+                let appClass = await paramSrc() as any;
                 if (appClass) {
                     if (appClass.__esModule) {
                         appClass = appClass.default;
@@ -51,7 +56,7 @@ class AppRegister {
                     return appClass;
                 } else {
                     throw new Error(
-                        `[WindowManager]: load remote script failed, ${srcOrAppOrFunction}`
+                        `[WindowManager]: load remote script failed, ${paramSrc}`
                     );
                 }
             };

package/src/index.ts

@@ -142,7 +142,7 @@ export type MountParams = {
 
 export const reconnectRefresher = new ReconnectRefresher({ emitter });
 
-export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> implements PageController {
+export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any> implements PageController {
     public static kind = "WindowManager";
     public static displayer: Displayer;
     public static wrapper?: HTMLElement;
@@ -218,7 +218,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> imple
                         throw new Error();
                     }
                 },
-                { retries: 10 }
+                { retries: 10 } as any,
             );
         }