@awayfl/awayfl-player 0.2.30 → 0.2.32

package/dist/index.js

@@ -1,4 +1,4 @@
-console.debug("AwayFL-Player - 0.2.30");
+console.debug("AwayFL-Player - 0.2.32");
 export { AVMPlayer } from "./lib/AVMPlayer";
 export { AVM1Player } from "./lib/AVM1Player";
 export { AVM2Player } from "./lib/AVM2Player";

package/dist/lib/AVMDebugInterface.js

@@ -157,13 +157,13 @@ var AVMDebug = /** @class */ (function () {
         if (pool) {
             //@ts-ignore
             var partition = pool.getNode(node).partition;
-            var picker = PickGroup.getInstance(view).getBoundsPicker(partition);
+            var picker = PickGroup.getInstance().getBoundsPicker(partition);
             //@ts-ignore
             box = picker.getBoxBounds(pool.getNode(this.player.root), true, true);
         }
         else {
             //@ts-ignore
-            box = PickGroup.getInstance(view).getBoundsPicker(node.partition).getBoxBounds(this.player.root);
+            box = PickGroup.getInstance().getBoundsPicker(node.partition).getBoxBounds(this.player.root);
         }
         if (!box)
             return null;

package/dist/lib/AVMPlayer.js

@@ -1,5 +1,5 @@
 import { __extends } from "tslib";
-import { AVMStage, AVMEvent } from "@awayfl/swf-loader";
+import { AVMStage, AVMEvent, AVMVERSION } from "@awayfl/swf-loader";
 import { AVMDebug } from "./AVMDebugInterface";
 import { AVM1Handler } from '@awayfl/avm1';
 import { AVM2Handler } from '@awayfl/avm2';
@@ -19,7 +19,7 @@ var AVMPlayer = /** @class */ (function (_super) {
     }
     AVMPlayer.prototype.onAVMAvailable = function (event) {
         if (this._debug) {
-            this._debug.onAvmInit(event.avmVersion === "AVM1" /* AVM1 */ ? 1 : 2);
+            this._debug.onAvmInit(event.avmVersion === AVMVERSION.AVM1 ? 1 : 2);
         }
     };
     return AVMPlayer;

package/dist/src/Main.js

@@ -0,0 +1,19 @@
+import { __extends } from "tslib";
+import { AVMPlayer } from "../index";
+var Main = /** @class */ (function (_super) {
+    __extends(Main, _super);
+    function Main(gameConfig) {
+        return _super.call(this, gameConfig) || this;
+        // LoaderInfo.DefaultLocation="/";
+        // gameConfig.redirects = [{
+        //     test: /img/,
+        //     resolve: (url) => `./assets/${url.replace(/\/\//g,'')}`
+        // },{
+        //     test: /media/,
+        //     resolve: (url) => `./assets/${url.replace(/\/\//g,'')}`
+        // }];
+    }
+    return Main;
+}(AVMPlayer));
+;
+window["AVMPlayerClass"] = Main;

package/index.ts

@@ -1,4 +1,4 @@
-console.debug("AwayFL-Player - 0.2.30");
+console.debug("AwayFL-Player - 0.2.32");
 
 export {AVMPlayer} from "./lib/AVMPlayer";
 export {AVM1Player} from "./lib/AVM1Player";

package/lib/AVMDebugInterface.ts

@@ -191,14 +191,14 @@ export class AVMDebug {
 		if (pool) {
 			//@ts-ignore
 			const partition = pool.getNode(node).partition;
-			const picker = PickGroup.getInstance(view).getBoundsPicker(partition);
+			const picker = PickGroup.getInstance().getBoundsPicker(partition);
 
 			//@ts-ignore
 			box = picker.getBoxBounds(pool.getNode(this.player.root), true, true);
  
 		} else {
 			//@ts-ignore
-			box = PickGroup.getInstance(view).getBoundsPicker(node.partition).getBoxBounds(this.player.root);
+			box = PickGroup.getInstance().getBoundsPicker(node.partition).getBoxBounds(this.player.root);
 		}
 
 		if (!box)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@awayfl/awayfl-player",
-	"version": "0.2.30",
+	"version": "0.2.32",
 	"description": "Flash Player emulator for executing SWF files (published for FP versions 6 and up) in javascript",
 	"main": "bundle/awayfl-player.umd.js",
 	"module": "dist/index.js",
@@ -30,7 +30,7 @@
 		"prebuild:prod": "npm run clean:bin",
 		"build:prod": "webpack --config webpack.config.js  --progress --env.prod",
 		"server": "npm run server:dev",
-		"server:dev": "webpack-dev-server --config webpack.config.js --progress --watch",
+		"server:dev": "webpack-dev-server --config webpack.config.js --progress",
 		"server:dev:hmr": "npm run server:dev -- --hot",
 		"server:prod": "http-server bin --cors",
 		"start": "npm run server:dev",
@@ -82,22 +82,19 @@
 		"@awayjs/view": "^0.6.0",
 		"@rollup/plugin-commonjs": "^18.0.0",
 		"@rollup/plugin-node-resolve": "^11.2.1",
-		"babel-core": "^6.26.3",
-		"copy-webpack-plugin": "^5.1.1",
-		"fs": "^0.0.1-security",
-		"html-webpack-plugin": "^4.2.0",
-		"path": "^0.12.7",
-		"rimraf": "^3.0.2",
-		"rollup": "^2.45.2",
-		"rollup-plugin-gzip": "^2.5.0",
+		"copy-webpack-plugin": "^11.0.0",
+		"html-webpack-plugin": "^5.5.0",
+		"rimraf": "^4.4.0",
+		"rollup": "^2.79.1",
+		"rollup-plugin-gzip": "^3.1.0",
 		"rollup-plugin-terser": "^7.0.2",
-		"terser-webpack-plugin": "^2.3.5",
-		"ts-loader": "^6.2.2",
+		"terser-webpack-plugin": "^5.3.7",
+		"ts-loader": "^9.4.2",
 		"tslib": "^1.9.0",
-		"typescript": "^3.8.3",
-		"webpack": "^4.42.1",
-		"webpack-cli": "^3.3.11",
-		"webpack-dev-server": "^3.10.3",
-		"webpack-merge": "^4.2.2"
+		"typescript": "^4.9.5",
+		"webpack": "^5.76.2",
+		"webpack-cli": "^5.0.1",
+		"webpack-dev-server": "^4.12.0",
+		"webpack-merge": "^5.8.0"
 	}
 }

package/scripts/initAwayDev_win.bat

@@ -9,6 +9,7 @@ ECHO  Cloning "@awayjs" modules from Github
 
 mkdir @awayjs
 cd @awayjs
+git clone https://github.com/awayjs/assembly.git
 git clone https://github.com/awayjs/core.git
 git clone https://github.com/awayjs/graphics.git
 git clone https://github.com/awayjs/scene.git
@@ -17,11 +18,19 @@ git clone https://github.com/awayjs/renderer.git
 git clone https://github.com/awayjs/materials.git
 git clone https://github.com/awayjs/view.git
 
+ECHO  Checkout and link "@awayjs/assembly" module
+cd assembly
+git checkout dev
+call yarn
+call yarn link
+cd..
+
 ECHO  Checkout and link "@awayjs/core" module
 cd core
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 cd..
 
 ECHO  Checkout and link "@awayjs/stage" module
@@ -29,6 +38,7 @@ cd stage
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 cd..
 
@@ -37,6 +47,7 @@ cd view
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 cd..
@@ -46,6 +57,7 @@ cd renderer
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/view
@@ -56,6 +68,7 @@ cd graphics
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/view
@@ -67,6 +80,7 @@ cd materials
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/renderer
@@ -78,6 +92,7 @@ cd scene
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/view
@@ -102,6 +117,7 @@ cd swf-loader
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/view
 call yarn link @awayjs/stage
@@ -116,6 +132,7 @@ cd avm1
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/view
 call yarn link @awayjs/stage
@@ -131,6 +148,7 @@ cd avm2
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/view
 call yarn link @awayjs/renderer
@@ -146,6 +164,7 @@ cd playerglobal
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/view
@@ -163,6 +182,7 @@ cd awayfl-player
 git checkout dev
 call yarn
 call yarn link
+call yarn link @awayjs/assembly
 call yarn link @awayjs/core
 call yarn link @awayjs/stage
 call yarn link @awayjs/view

package/scripts/updateAwayDev_win.bat

@@ -11,6 +11,8 @@ cd..
 cd..
 cd @awayjs
 
+call :process_module awayjs assembly || GOTO handle_fail
+
 call :process_module awayjs core || GOTO handle_fail
 
 call :process_module awayjs stage || GOTO handle_fail

package/tsconfig.json

@@ -4,14 +4,10 @@
     "target": "es5",
     "module": "es2015",
     "moduleResolution": "node",
-    "noImplicitUseStrict": true,
     "noEmitHelpers": true,
     "importHelpers": true,
     "declaration": true,
     "declarationMap": true,
     "outDir": "./dist"
   },
-  "files": [
-    "./index.ts"
-  ]
 }

package/webpack.config.js

@@ -6,7 +6,7 @@ const HTMLWebPackPlugin = require('html-webpack-plugin');
 const Terser = require('terser-webpack-plugin')
 const rimraf = require("rimraf");
 const tsloader = require.resolve('ts-loader');
-const merge = require("webpack-merge");
+const merge = require("webpack-merge").merge;
 const config = require('./awayfl.config.js')
 
 module.exports = (env = {}) => {
@@ -70,7 +70,9 @@ module.exports = (env = {}) => {
 			colors: true // wp4
 		},
 		devServer: {
-			progress: true, // wp4
+			client: {
+				progress: true,
+			}
 		},
 
 
@@ -81,12 +83,14 @@ module.exports = (env = {}) => {
 		devtool: 'source-map',
 		//devtool: 'cheap-module-eval-source-map',//use this option for recompiling libs
 		devServer: {
-			contentBase: path.join(process.cwd(), "src"),
-			inline: true,
-			publicPath: "/",
+			//contentBase: path.join(process.cwd(), "src"),
+			static: {
+				publicPath: "/",
+			},
 			open: false,
-			progress: true,
-
+			client: {
+				progress: true,
+			}
 		},
 		optimization: {
 			//minimize: false // wp4
@@ -127,16 +131,20 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 	// 	if no split, copy as3 buildins to asset folder
 	//	if split, we will copy them for each game-config individually
 	if (config.buildinsPath && config.buildinsPath.length && !config.split) {
-		plugins.push(new CopyWebPackPlugin([
-			{ from: config.buildinsPath, to: 'assets/builtins' },
-		]));
+		plugins.push(new CopyWebPackPlugin({
+			patterns: [
+				{ from: config.buildinsPath, to: 'assets/builtins' },
+			],
+		}));
 	}
 
 	//	copy loader.js to js-folder
 	//	if split, this will be copied to the subfolder together with webpack-bundel
-	plugins.push(new CopyWebPackPlugin([
-		{ from: config.loaderTemplate, to: 'js' },
-	]));
+	plugins.push(new CopyWebPackPlugin({
+		patterns: [
+			{ from: config.loaderTemplate, to: 'js' },
+		],
+	}));
 
 	// collect all game-urls to create a index.html:
 	let gameURLS = {};
@@ -153,9 +161,11 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 		//	if split, copy buildins to each output folder:
 
 		if (config.buildinsPath && config.buildinsPath.length && config.split) {
-			plugins.push(new CopyWebPackPlugin([
-				{ from: config.buildinsPath, to: outputPath + 'assets/builtins' },
-			]));
+			plugins.push(new CopyWebPackPlugin({
+				patterns: [
+					{ from: config.buildinsPath, to: outputPath + 'assets/builtins' },
+				],
+			}));
 		}
 
 		// get config for this file merged with default values from global config:
@@ -173,12 +183,16 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 		if (!fs.existsSync(path.join(rootPath, "src", "assets", configForHTML.splash))) {
 			throw ("invalid splashscreen path for fileconfig " + configForHTML.splash);
 		}
-		plugins.push(new CopyWebPackPlugin([
-			{ from: swfPath, to: outputPath + "assets" },
-		]));
-		plugins.push(new CopyWebPackPlugin([
-			{ from: path.join(rootPath, "src", "assets", configForHTML.splash), to: outputPath + "assets" },
-		]));
+		plugins.push(new CopyWebPackPlugin({
+			patterns: [
+				{ from: swfPath, to: outputPath + "assets" },
+			],
+		}));
+		plugins.push(new CopyWebPackPlugin({
+			patterns: [
+				{ from: path.join(rootPath, "src", "assets", configForHTML.splash), to: outputPath + "assets" },
+			],
+		}));
 
 		//	optional copy startscreen:
 
@@ -186,9 +200,11 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 			if (!fs.existsSync(path.join(rootPath, "src", "assets", configForHTML.start))) {
 				throw ("invalid startscreen path for fileconfig " + configForHTML.start);
 			}
-			plugins.push(new CopyWebPackPlugin([
-				{ from: path.join(rootPath, "src", "assets", configForHTML.start), to: outputPath + "assets" },
-			]));
+			plugins.push(new CopyWebPackPlugin({
+				patterns: [
+					{ from: path.join(rootPath, "src", "assets", configForHTML.start), to: outputPath + "assets" },
+				],
+			}));
 		}
 
 		// create/prepare config props needed for runtime
@@ -208,9 +224,11 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 					if (!fs.existsSync(res_path)) {
 						throw ("invalid filename path for resource " + res_path);
 					}
-					plugins.push(new CopyWebPackPlugin([
-						{ from: res_path, to: outputPath + "assets" },
-					]));
+					plugins.push(new CopyWebPackPlugin({
+						patterns: [
+							{ from: res_path, to: outputPath + "assets" },
+						],
+					}));
 					stats = fs.statSync(res_path);
 					res_filesize = stats["size"];
 					copiedResources[res_unique_outputPath] = res_filesize;
@@ -235,9 +253,11 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 				let folder = fs.lstatSync(res_path).isDirectory();
 				let name = path.basename(res_path);
 
-				plugins.push(new CopyWebPackPlugin([
-					{ from: res_path, to: outputPath + "assets" + (folder ? "/" + name : "")  },
-				]));
+				plugins.push(new CopyWebPackPlugin({
+					patterns: [
+						{ from: res_path, to: outputPath + "assets" + (folder ? "/" + name : "")  },
+					],
+				}));
 				
 			}
 		}
@@ -316,18 +336,20 @@ const processConfig = (config, rootPath, CopyWebPackPlugin, HTMLWebPackPlugin, B
 			}
 		}
 
-		plugins.push(new CopyWebPackPlugin([
-			{
-				from: htmlSourcePath,
-				to: htmlOutputPath,
-				transform: function (content, src) {
-					return content.toString()
-						.replace(/INSERT_TITLE/g, configForHTML.title ? configForHTML.title : "UNTITLED")
-						.replace(/INSERT_SPLASHSCREEN/g, configForHTML.splash)
-						.replace(/INSERT_CODE/g, jsStringForHTML);
+		plugins.push(new CopyWebPackPlugin({
+			patterns: [
+				{
+					from: htmlSourcePath,
+					to: htmlOutputPath,
+					transform: function (content, src) {
+						return content.toString()
+							.replace(/INSERT_TITLE/g, configForHTML.title ? configForHTML.title : "UNTITLED")
+							.replace(/INSERT_SPLASHSCREEN/g, configForHTML.splash)
+							.replace(/INSERT_CODE/g, jsStringForHTML);
+					}
 				}
-			}
-		]));
+			],
+		}));
 	};
 
 	var swfPath, stats, filesize;

package/yarn-error.log

@@ -1,109 +0,0 @@
-Arguments: 
-  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js
-
-PATH: 
-  C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd;C:\Program Files (x86)\Yarn\bin\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseHg\;C:\Program Files\nodejs\;C:\Program Files\dotnet\;C:\Users\Rob Bateman\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Microsoft VS Code\bin;C:\Users\Rob Bateman\AppData\Local\GitHubDesktop\bin;C:\Users\Rob Bateman\AppData\Local\Yarn\bin;C:\Users\Rob Bateman\AppData\Local\Microsoft\WindowsApps;C:\Users\Rob Bateman\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\Rob Bateman\AppData\Roaming\npm;
-
-Yarn version: 
-  1.6.0
-
-Node version: 
-  10.15.3
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: https://registry.yarnpkg.com/@awayfl%2favm2: Not found
-      at Request.params.callback [as _callback] (C:\Program Files (x86)\Yarn\lib\cli.js:65327:18)
-      at Request.self.callback (C:\Program Files (x86)\Yarn\lib\cli.js:133155:22)
-      at Request.emit (events.js:189:13)
-      at Request.<anonymous> (C:\Program Files (x86)\Yarn\lib\cli.js:134138:10)
-      at Request.emit (events.js:189:13)
-      at IncomingMessage.<anonymous> (C:\Program Files (x86)\Yarn\lib\cli.js:134058:12)
-      at Object.onceWrapper (events.js:277:13)
-      at IncomingMessage.emit (events.js:194:15)
-      at endReadableNT (_stream_readable.js:1125:12)
-      at process._tickCallback (internal/process/next_tick.js:63:19)
-
-npm manifest: 
-  {
-    "name": "@awayfl/awayfl-player",
-    "version": "0.1.0",
-    "description": "VIrtual machine for executing AS1 and AS2 code",
-    "main": "bundle/awayfl-awayfl-player.umd.js",
-    "module": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "url": "http://www.away3d.com",
-    "author": "Rob Bateman",
-    "repository": {
-      "type": "git",
-      "url": "git+https://github.com/awayfl/awayfl-player.git"
-    },
-    "scripts": {
-      "rimraf": "rimraf",
-      "rollup": "rollup -c",
-      "uglifyjs": "uglifyjs ./bundle/awayfl-awayfl-player.umd.js -o ./bundle/awayfl-awayfl-player.umd.min.js --source-map \"content='./bundle/awayfl-awayfl-player.umd.js.map'\" --mangle",
-      "tsc": "tsc --lib ES2015.Symbol,DOM,ScriptHost,ES5,ES2015,ES2015.Iterable",
-      "tsc:build": "npm run tsc || exit 0",
-      "clean": "npm cache clean && npm run rimraf -- node_modules dist bundle",
-      "clean:dist": "npm run rimraf -- dist bundle",
-      "watch": "npm run tsc -- --w",
-      "prebuild": "npm run clean:dist",
-      "build": "npm run tsc:build && npm run rollup && npm run uglifyjs",
-      "copyVersionToIndex": "node ./copyVersionToIndex && git add ./index.ts && git commit -m \"update version number in index.ts\"",
-      "version": "npm run copyVersionToIndex && npm run build",
-      "postversion": "git push && git push --tags && npm publish"
-    },
-    "keywords": [
-      "AwayJS",
-      "WebGL",
-      "2D",
-      "3D",
-      "graphics"
-    ],
-    "license": "Apache-2.0",
-    "bugs": {
-      "url": "https://github.com/awayjs/awayfl-player/issues"
-    },
-    "homepage": "https://github.com/awayjs/awayfl-player#readme",
-    "peerDependencies": {
-      "@awayfl/avm2": "^0.1.0",
-      "@awayfl/playerglobal": "^0.1.0",
-      "@awayjs/core": "^0.8.0",
-      "@awayjs/graphics": "^0.4.0",
-      "@awayjs/materials": "^0.5.0",
-      "@awayjs/renderer": "^0.10.0",
-      "@awayjs/scene": "^0.12.0",
-      "@awayjs/stage": "^0.10.0",
-      "@awayjs/view": "^0.5.0",
-      "@awayjs/swf-viewer": "^0.3.0",
-      "tslib": "^1.9.0"
-    },
-    "devDependencies": {
-      "@awayfl/avm2": "^0.1.0",
-      "@awayfl/playerglobal": "^0.1.0",
-      "@awayjs/core": "^0.8.0",
-      "@awayjs/graphics": "^0.4.0",
-      "@awayjs/materials": "^0.5.0",
-      "@awayjs/renderer": "^0.10.0",
-      "@awayjs/scene": "^0.12.0",
-      "@awayjs/stage": "^0.10.0",
-      "@awayjs/view": "^0.5.0",
-      "@awayjs/swf-viewer": "^0.3.0",
-      "rimraf": "^2.5.2",
-      "rollup": "^0.57.1",
-      "rollup-plugin-commonjs": "^9.1.0",
-      "rollup-plugin-includepaths": "^0.2.1",
-      "rollup-plugin-node-resolve": "^3.3.0",
-      "tslib": "^1.9.0",
-      "typescript": "^3.7.3",
-      "uglify-js": "^3.0.15"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile