@swf2es/player-hosts 0.1.1 → 0.1.3

package/dist/thread/player/avm1/avm1.js

@@ -65,7 +65,7 @@ import { xmlClass } from "./globals/XML.js";
 import { xmlNodeClass, serialize as xmlString } from "./globals/XMLNode.js";
 import { xmlSocketClass } from "./globals/XMLSocket.js";
 import { Avm1Input } from "./input.js";
-import { MovieLoads } from "./loads.js";
+import { MovieLoads, queryVariables } from "./loads.js";
 import { Avm1Net, textFor } from "./net.js";
 import { asciiLower, atPath, childByName, pathOf, under } from "./paths.js";
 import { ActionQueue, BLOCK, CONSTRUCT, CONSTRUCTION, FRAME, HALT, INIT, INITIALIZE, METHOD, NORMAL, Queued, } from "./queue.js";
@@ -209,6 +209,8 @@ export class Avm1 {
     /** The focus, what Tab moves it through and Selection's listeners. */
     focusTracker = new FocusTracker(this);
     url;
+    /** The page's flashvars for the main SWF's root. */
+    parameters;
     storage;
     /** SharedObject's writes of what its scripts changed, as the player goes: none before attach. */
     sharedObjects = null;
@@ -231,6 +233,7 @@ export class Avm1 {
         this.onUncaught = options.onUncaught ?? ((error) => console.error(error));
         this.fileHost = options.fileHost === undefined ? browserFileHost() : options.fileHost;
         this.url = options.url ?? "";
+        this.parameters = options.parameters ?? {};
         this.localConnections = options.localConnections ?? new LocalConnections();
         this.storage = options.storage ?? defaultStorage();
         this.net = new Avm1Net(options.fetch ?? null, options.socket ?? null, options.base ?? this.url, options.sendToUrl ?? true);
@@ -399,6 +402,17 @@ export class Avm1 {
         realm.global.define("TextSnapshot", textSnapshotClass(realm), avm1.DONT_ENUM);
         this.adopt(main);
         this.made(root);
+        // Its parameters, as Flash defines them on the root before the first frame's actions run.
+        const face = root.avm1;
+        if (face !== null) {
+            const parameters = new Map(queryVariables(this.url));
+            for (const [name, value] of Object.entries(this.parameters)) {
+                parameters.set(name, String(value));
+            }
+            for (const [name, value] of parameters) {
+                face.define(name, textFor(value, this.swfVersion), 0);
+            }
+        }
     }
     /** A SWF's timelines told to this: their clips are made and play through it from now on. */
     adopt(swf) {
@@ -841,6 +855,10 @@ export class Avm1 {
     registeredName(constr) {
         return this.classes.registeredName(constr);
     }
+    /** SharedObject writes what its scripts changed, as Flash did as a SWF closed: the page may be going. */
+    saveSharedObjects() {
+        this.sharedObjects?.flush(this.swfVersion);
+    }
     /** The player gone: SharedObject writes what its scripts changed, as Flash did as a SWF closed. */
     destroy(closeAudio = true) {
         for (const bytes of this.codeLive) {

package/dist/thread/player/avm1/loads.js

@@ -53,11 +53,11 @@ async function arrive(result, decode) {
     return { type: "swf", swf, library, size: bytes.length, status };
 }
 /**
- * A URL's query as a loaded SWF's root gets it, each name a variable, as
+ * A URL's query as a SWF's root gets it, each name a variable, as
  * Ruffle's movie_loader_complete defines a movie's parameters: decoded,
  * `+` a space, a name without `=` an empty value.
  */
-function queryVariables(url) {
+export function queryVariables(url) {
     const path = url.split("#", 1)[0];
     const at = path.indexOf("?");
     if (at < 0) {

package/dist/thread/player/player.js

@@ -240,6 +240,16 @@ export class Player {
      * for the player, its renderer, its input bindings and its loop, is the
      * host's to let go.
      */
+    /**
+     * Write what scripts changed in their SharedObjects, as Flash did as a
+     * SWF closed, without stopping anything: a host calls it as its page goes
+     * away, where destroy() may never run.
+     */
+    saveSharedObjects() {
+        this.scripting?.flushSharedObjects?.();
+        this.scripting?.loads.saveAvm1SharedObjects();
+        this.avm1?.saveSharedObjects();
+    }
     destroy() {
         if (!this.stopped) {
             drawKernelLetGo();

package/dist/thread/player/playerglobal/flash/net/SharedObject.js

@@ -247,8 +247,8 @@ export function sharedObjectNatives(s) {
             }
         }
     }
-    // Flash wrote each open object as its SWF went: a destroyed player
-    // writes those a script changed since they were read or written. Never
+    // Flash wrote each open object as its SWF went: a player hidden or
+    // destroyed writes those a script changed since they were read or written. Never
     // a removal: an object whose stored file it could not read starts empty,
     // and an unchanged one would take the file away.
     s.flushSharedObjects = () => {
@@ -257,6 +257,7 @@ export function sharedObjectNatives(s) {
                 const file = serialize(o);
                 if (file.length && !sameBytes(file, o.$saved)) {
                     s.storage.set(o.$key, file);
+                    o.$saved = file;
                 }
             }
             catch {

package/dist/thread/player/scripting/loads.js

@@ -65,6 +65,12 @@ export class Loads {
         }
         return frames;
     }
+    /** The AVM1 movies' SharedObjects written, as the page may be going. */
+    saveAvm1SharedObjects() {
+        for (const movie of this.avm1Movies.values()) {
+            movie.vm.saveSharedObjects();
+        }
+    }
     destroyAvm1() {
         for (const movie of this.avm1Movies.values()) {
             movie.vm.destroy(false);

package/dist/thread/runtime/avm1/functions.js

@@ -73,6 +73,10 @@ export class ScriptFunction extends Avm1Function {
         this.clip = clip;
         this.definer = definer;
     }
+    /** The realm's count of removals as it last asked whether `target` was removed, -1 before. */
+    looked = -1;
+    /** Whether `target` was removed as it last asked. */
+    gone = false;
     /**
      * Run its body with `self` as `this`, `depth` how far up `this`'s
      * prototypes it was found (which `super` starts from), in an activation
@@ -98,7 +102,23 @@ export class ScriptFunction extends Avm1Function {
         let scope = this.scope;
         let target = this.target;
         let clip = this.clip;
-        if (this.version < 6) {
+        if (this.version >= 6 && caller.host.removed !== undefined) {
+            // A clip whose code defined it may since be gone, a loaded SWF's
+            // classes after it was unloaded among them: it runs on `this` where
+            // that is a clip, else on the caller's target, rather than returning
+            // at its first call, as code returns whose clip a call removes
+            // (Ruffle's resolve_reference of its base clip, then this_do).
+            if (this.looked !== realm.removals) {
+                this.looked = realm.removals;
+                this.gone = caller.host.removed(target);
+            }
+            if (this.gone) {
+                const own = self instanceof Avm1Object ? caller.host.clipOf?.(self) : undefined;
+                target = own ?? targetOrRoot(caller);
+                clip = own !== undefined ? self : caller.clip;
+            }
+        }
+        else if (this.version < 6) {
             const own = self instanceof Avm1Object ? caller.host.clipOf?.(self) : undefined;
             if (own !== undefined) {
                 target = own;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swf2es/player-hosts",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Optional Node and WebSocket transports, worker threads, an IndexedDB module cache and precompiled modules for the swf2es player",
   "keywords": [
     "swf",
@@ -60,6 +60,6 @@
     "LICENSE.third-party"
   ],
   "dependencies": {
-    "@swf2es/player": "0.1.1"
+    "@swf2es/player": "0.1.3"
   }
 }