@netless/window-manager 0.4.0 → 0.4.1-canary.0

package/docs/advanced.md

@@ -1,15 +1,14 @@
 ## 进阶使用
 
 - 目录
-  - [撤销重做]
+  - [撤销重做](#redo-undo)
+  - [清屏](#clean-current-scene)
 
 
-
-<h3>撤销重做</h3>
+<h3 id="redo-undo">撤销重做</h3>
 
 > 以下事件和属性都会根据 `focus` 的窗口来进行自动切换应用对象
 
-
 #### 获取可以撤销/重做的步数
 
 ```ts
@@ -37,3 +36,18 @@ manager.undo() //撤销
 manager.redo() // 重做 
 ```
 
+<br>
+
+<h3 id="clean-current-scene">清屏</h3>
+
+因为在多窗口模式下有多个白板, 如果想要清除当前 `focus` 的白板只需要调用
+
+```ts
+manager.cleanCurrentScene()
+```
+
+只想清理主白板的笔迹则需要
+
+```ts
+manager.mainView.cleanCurrentScene()
+```

package/docs/api.md

@@ -190,4 +190,14 @@ manager.callbacks.on(events, listener)
 | focusedChange            | string, undefined |     | 当前 focus 的 appId，主白板时为 undefined  |
 | mainViewScenesLengthChange | number      |         | mainView scenes 添加或删除时触发 |
 | canRedoStepsChange       | number         |         | 当前 focus 的 view 可重做步数改变 |
-| canUndoStepsChange       | number         |         | 当前 focus 的 view 可撤销步数改变 |
+| canUndoStepsChange       | number         |         | 当前 focus 的 view 可撤销步数改变 |
+| loadApp                  | LoadAppEvent   |         | 加载远程APP 事件                |
+
+
+```ts
+type LoadAppEvent = {
+    kind: string;
+    status: "start" | "success" | "failed";
+    reason?: string;
+}
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.0",
+  "version": "0.4.1-canary.0",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -18,7 +18,6 @@
   "author": "",
   "license": "ISC",
   "peerDependencies": {
-    "video.js": ">=7",
     "white-web-sdk": "^2.16.0"
   },
   "dependencies": {
@@ -56,8 +55,7 @@
     "rollup-plugin-styles": "^3.14.1",
     "svelte": "^3.42.4",
     "typescript": "^4.3.5",
-    "video.js": "^7.14.3",
     "vite": "^2.5.3",
-    "white-web-sdk": "^2.16.6"
+    "white-web-sdk": "2.16.3"
   }
 }

package/src/Register/index.ts

@@ -1,6 +1,12 @@
 import Emittery from "emittery";
-import type { NetlessApp, RegisterEvents, RegisterParams } from "../typings";
 import { loadApp } from "./loader";
+import type { NetlessApp, RegisterEvents, RegisterParams } from "../typings";
+
+export type LoadAppEvent = {
+    kind: string;
+    status: "start" | "success" | "failed";
+    reason?: string;
+};
 
 class AppRegister {
     public kindEmitters: Map<string, Emittery<RegisterEvents>> = new Map();

package/src/Register/loader.ts

@@ -1,9 +1,10 @@
+import { callbacks } from "../index";
 import { getItem, setItem } from "./storage";
 import type { NetlessApp } from "../typings";
 
 const Prefix = "NetlessApp";
 
-const TIMEOUT = 10000; // 10 秒超时
+const TIMEOUT = 10000; // 下载 script 10 秒超时
 
 export const getScript = async (url: string): Promise<string> => {
     const item = await getItem(url);
@@ -33,19 +34,33 @@ export const loadApp = async (
     name?: string
 ): Promise<NetlessApp | undefined> => {
     const appName = name || Prefix + key;
-    const text = await getScript(url);
+    callbacks.emit("loadApp", { kind: key, status: "start" });
     try {
-        return executeScript(text, appName);
-    } catch (error: any) {
-        if (error.message.includes("Can only have one anonymous define call per script file")) {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            const define = window.define;
-            if ("function" == typeof define && define.amd) {
-                delete define.amd;
+        const text = await getScript(url);
+        if (!text || text.length === 0) {
+            callbacks.emit("loadApp", { kind: key, status: "failed", reason: "script is empty." });
+            return;
+        }
+        try {
+            const result = executeScript(text, appName);
+            callbacks.emit("loadApp", { kind: key, status: "success" });
+            return result;
+        } catch (error: any) {
+            if (error.message.includes("Can only have one anonymous define call per script file")) {
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                const define = window.define;
+                if ("function" == typeof define && define.amd) {
+                    delete define.amd;
+                }
+                const result = executeScript(text, appName);
+                callbacks.emit("loadApp", { kind: key, status: "success" });
+                return result;
             }
-            return executeScript(text, appName);
+            callbacks.emit("loadApp", { kind: key, status: "failed", reason: error.message });
         }
+    } catch (error: any) {
+        callbacks.emit("loadApp", { kind: key, status: "failed", reason: error.message });
     }
 };
 

package/src/index.ts

@@ -17,6 +17,7 @@ import { replaceRoomFunction } from "./Utils/RoomHacker";
 import { setupBuiltin } from "./BuiltinApps";
 import "./style.css";
 import "@netless/telebox-insider/dist/style.css";
+import type { LoadAppEvent } from "./Register";
 import {
     addEmitterOnceListener,
     ensureValidScenePath,
@@ -152,6 +153,7 @@ export type PublicEvent = {
     mainViewScenesLengthChange: number;
     canRedoStepsChange: number;
     canUndoStepsChange: number;
+    loadApp: LoadAppEvent;
 };
 
 export type MountParams = {