@netless/app-slide 0.3.0-canary.12 → 0.3.0-canary.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/app-slide",
-  "version": "0.3.0-canary.12",
+  "version": "0.3.0-canary.13",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
     "README-zh.md"
   ],
   "dependencies": {
-    "@netless/slide": "^0.7.2"
+    "@netless/slide": "^0.7.4"
   },
   "devDependencies": {
     "@types/color-string": "^1.5.2",

package/src/connect.ts

@@ -1,17 +1,19 @@
-import type { AppContext, WhiteBoardView } from "@netless/window-manager";
+import type { AppContext, Storage, WhiteBoardView } from "@netless/window-manager";
 import type { SideEffectManager } from "side-effect-manager";
 import type { SlideViewer } from "./SlideViewer";
+import type { Attributes } from "./typings";
 
 import { get } from "./utils";
 
 export interface ConnectParams {
   context: AppContext;
+  storage: Storage<Attributes>;
   viewer: SlideViewer;
   sideEffect: SideEffectManager;
   logger: { info: (msg: string) => void };
 }
 
-export function connect({ context, viewer, sideEffect, logger }: ConnectParams) {
+export function connect({ context, storage, viewer, sideEffect, logger }: ConnectParams) {
   const log = logger.info.bind(logger);
 
   let whiteboard: WhiteBoardView | null = null;
@@ -26,14 +28,14 @@ export function connect({ context, viewer, sideEffect, logger }: ConnectParams)
 
   const { slide } = viewer;
 
-  function dump_state(state: unknown = context.storage.state.state) {
+  function dump_state(state: unknown = storage.state.state) {
     return JSON.stringify(state);
   }
 
   function kick_start() {
-    if (context.storage.state.state) {
+    if (storage.state.state) {
       log("[Slide] restore " + dump_state());
-      slide.setSlideState(context.storage.state.state);
+      slide.setSlideState(storage.state.state);
     } else if (context.isAddApp) {
       log("[Slide] kick start");
       slide.renderSlide(1);
@@ -41,7 +43,7 @@ export function connect({ context, viewer, sideEffect, logger }: ConnectParams)
       log("[Slide] wait for restore");
       const timeoutID = sideEffect.add(() => {
         const timer = setInterval(() => {
-          if (!context.storage.state.state) {
+          if (!storage.state.state) {
             log("[Slide] timeout");
             slide.renderSlide(1);
           }
@@ -49,10 +51,10 @@ export function connect({ context, viewer, sideEffect, logger }: ConnectParams)
         return () => clearInterval(timer);
       });
       const disposerID = sideEffect.push(
-        context.storage.on("stateChanged", () => {
-          if (context.storage.state.state) {
+        storage.on("stateChanged", () => {
+          if (storage.state.state) {
             log("[Slide] restore " + dump_state());
-            slide.setSlideState(context.storage.state.state);
+            slide.setSlideState(storage.state.state);
             sideEffect.flush(disposerID);
             sideEffect.flush(timeoutID);
           }
@@ -65,7 +67,7 @@ export function connect({ context, viewer, sideEffect, logger }: ConnectParams)
   slide.on("stateChange", () => {
     if (context.isWritable) {
       // log("[Slide] save state " + dump_state(slide.slideState));
-      context.storage.setState({ state: slide.slideState });
+      storage.setState({ state: slide.slideState });
     }
   });
   slide.on("syncDispatch", payload => {

package/src/index.ts

@@ -30,10 +30,12 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, void> = {
     const logger = new Logger(context);
     logger.info("[Slide] setup @ " + __APP_VERSION__);
 
-    if (!context.storage.state.taskId) {
+    if (!context.attributes.taskId) {
       throw new Error("[Slide] no taskId");
     }
 
+    const storage = context.createStorage("slide", context.attributes);
+
     const appOptions = context.getAppOptions() || {};
     const renderOptions = appOptions.renderOptions || {};
 
@@ -61,8 +63,8 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, void> = {
       loaderDelegate: appOptions.loaderDelegate,
       navigatorDelegate: appOptions.navigatorDelegate,
       fixedFrameSize: appOptions.fixedFrameSize,
-      taskId: context.storage.state.taskId,
-      url: context.storage.state.url,
+      taskId: storage.state.taskId,
+      url: storage.state.url,
     });
 
     // For debugging.
@@ -97,7 +99,7 @@ const SlideApp: NetlessApp<Attributes, MagixEvents, AppOptions, void> = {
     sideEffect.push(() => viewer.destroy());
 
     // Connect UI with Netless App
-    connect({ context, viewer, sideEffect, logger });
+    connect({ context, storage, viewer, sideEffect, logger });
 
     context.emitter.on("destroy", () => {
       logger.info("[Slide] destroy");