@vyr/remote 0.0.1 → 0.0.3

package/package.json

@@ -1,18 +1 @@
-{
-  "name": "@vyr/remote",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "dom-to-image": "^2.6.0",
-    "@vyr/locale": "0.0.1",
-    "@vyr/declare": "0.0.1",
-    "@vyr/engine": "0.0.1"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ]
-}
+{"name":"@vyr/remote","version":"0.0.3","description":"","main":"./src/index.ts","author":"","license":"MIT","dependencies":{"dom-to-image":"^2.6.0","@vyr/locale":"0.0.3","@vyr/declare":"0.0.3","@vyr/engine":"0.0.3"},"files":["package.json","src/"]}

package/src/ChangeScriptable.ts

@@ -1,10 +1,10 @@
-import { Descriptor, Graphics, HTMLTransformControllerChangeArgs, HTMLTransformControllerDescriptor, Scriptable } from "@vyr/engine";
+import { Descriptor, Graphics, HTMLTransformControllerChangeArgs, Scriptable } from "@vyr/engine";
 import { RemoteProcess } from "./RemoteProcess";
 import { Job } from "./job";
 
-class ChangeScriptable extends Scriptable {
+class ChangeScriptable extends Scriptable<HTMLTransformControllerChangeArgs> {
 
-    execute(descriptor: HTMLTransformControllerDescriptor, graphics: Graphics, args: HTMLTransformControllerChangeArgs) {
+    execute(graphics: Graphics, args: HTMLTransformControllerChangeArgs) {
         const process = RemoteProcess.get(graphics.engine)
         if (process === null) return
 

package/src/RemoteExecutor.ts

@@ -1,4 +1,4 @@
-import { AnimationUnitInterpreter, Asset, Compilation, Descriptor, DeserializationObject, DivDescriptor, DynamicDescriptor, Engine, Graphics, HTMLDescriptor, HTMLServiceDescriptor, HTMLTransformControllerDescriptor, observer, PrefabeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, StyleDescriptor, Unit, UpdateArgs } from '@vyr/engine'
+import { AnimationUnitInterpreter, Asset, Compilation, Descriptor, DeserializationObject, DivDescriptor, DynamicDescriptor, Engine, Graphics, HTMLDescriptor, HTMLServiceDescriptor, HTMLTransformControllerDescriptor, observer, PrefabeDescriptor, ServiceDescriptor, ServiceSchedulerDescriptor, StyleDescriptor, Unit } from '@vyr/engine'
 import { cleanPickupObject, getAnimationUnit, createControllerStyle, pickupObject, getAnimationUnitByAsset, screenshot } from './utils'
 import { Collection } from './Collection'
 import { RemoteProcess } from './RemoteProcess'
@@ -21,6 +21,7 @@ class RemoteExecutor {
 
             this.process.scene = task.params.url
             await Asset.loadAll(task.params.url)
+            await Asset.compileDataset(task.params.url, this.process.engine)
 
             //渲染新场景
             const scheduler = Asset.get<ServiceSchedulerDescriptor>(task.params.url)
@@ -82,6 +83,7 @@ class RemoteExecutor {
         }
 
         await Asset.loadAll(this.process.scene)
+        await Asset.compileDataset(this.process.scene, this.process.engine)
         this.sendAnimationUnitToRemote(0, getAnimationUnit(this.process.scheduler))
     }
     async removeyScene(task: InstanceType<typeof Job['scene']['remove']['Task']>) {
@@ -133,6 +135,7 @@ class RemoteExecutor {
         this.updateOtherUpdateJob(target, task.params.content)
         target.syncWith(task.params.content)
         await Asset.loadAll(this.process.scene)
+        await Asset.compileDataset(this.process.scene, this.process.engine)
 
         this.sendAnimationUnitToRemote(0, getAnimationUnit(this.process.scheduler))
 
@@ -147,6 +150,7 @@ class RemoteExecutor {
 
             this.process.asset = task.params.url
             await Asset.loadAll(task.params.url)
+            await Asset.compileDataset(task.params.url, this.process.engine)
 
             const scheduler = new ServiceSchedulerDescriptor()
             const descriptor = Asset.get<Descriptor>(task.params.url)
@@ -219,6 +223,7 @@ class RemoteExecutor {
 
         await Asset.loadAll(task.params.url)
         Asset.graph.update(this._defaultScheduleUrl)
+        await Asset.compileDataset(task.params.url, this.process.engine)
 
         this.sendAnimationUnitToRemote(0, getAnimationUnitByAsset(task.params.url))
     }
@@ -272,6 +277,7 @@ class RemoteExecutor {
         target.syncWith(task.params.content)
         await Asset.loadAll(task.params.url)
         Asset.graph.update(this._defaultScheduleUrl)
+        await Asset.compileDataset(this.process.scene, this.process.engine)
 
         this.sendAnimationUnitToRemote(0, getAnimationUnitByAsset(task.params.url))
 
@@ -347,7 +353,7 @@ class RemoteExecutor {
             }
         }
     }
-    onUpdateScheduler(unit: Unit, args: UpdateArgs) {
+    onUpdateScheduler(unit: Unit) {
         const htmlTransform = Descriptor.get<Descriptor>(unit.uuid)
         const service = this.htmlTransformCollection.getByMap(htmlTransform)
         if (service !== null) {
@@ -387,29 +393,28 @@ class RemoteExecutor {
         }
     }
 
-    enhance(process: RemoteProcess, schedulerWrapper: ((scheduler: ServiceSchedulerDescriptor) => void) | null = null) {
+    enhance(process: RemoteProcess, schedulerWrapper: ((graphics: Graphics) => void) | null = null) {
         const executor = process.getExecutor()
         const listen = Compilation.prototype.listen
 
-        Compilation.prototype.listen = function (scheduler: ServiceSchedulerDescriptor, engine: Engine) {
-            if (schedulerWrapper !== null) schedulerWrapper(scheduler)
-            listen.call(this, scheduler, engine)
-            const graphics = engine.getGraphics(scheduler)
-            if (graphics === null || graphics.__VYR_REMOTE_WRAPPER === true) return graphics
+        Compilation.prototype.listen = function (graphics: Graphics) {
+            if (schedulerWrapper !== null) schedulerWrapper(graphics)
+            listen.call(this, graphics)
+            if (graphics.__VYR_REMOTE_WRAPPER === true) return graphics
             graphics.__VYR_REMOTE_WRAPPER = true
 
             return graphics
         }
 
         const doUpdate = Graphics.prototype.doUpdate
-        Graphics.prototype.doUpdate = function (unit: Unit, args: UpdateArgs) {
+        Graphics.prototype.doUpdate = function (unit: Unit) {
             if (this.__VYR_REMOTE_WRAPPER === true) {
                 //@ts-ignore
                 window['__VYR_RUNTIME.DISABLED_INPUT'] = true
-                executor.onUpdateScheduler(unit, args)
-                doUpdate.call(this, unit, args)
+                executor.onUpdateScheduler(unit)
+                doUpdate.call(this, unit)
             } else {
-                doUpdate.call(this, unit, args)
+                doUpdate.call(this, unit)
             }
         }
 

package/src/RemoteProcess.ts

@@ -75,7 +75,7 @@ class RemoteProcess {
     this._executor = executor
   }
   getExecutor<T extends RemoteExecutor = RemoteExecutor>() {
-    return this._executor as T
+    return (this._executor ?? null) as T
   }
 }