web: Correct IANA Flash MIME type

Author: n0samu

web/packages/core/src/plugin-polyfill.ts

@@ -1,3 +1,10 @@
+import {
+    FLASH_MIMETYPE,
+    FUTURESPLASH_MIMETYPE,
+    FLASH7_AND_8_MIMETYPE,
+    FLASH_MOVIE_MIMETYPE,
+} from "./ruffle-player";
+
 /**
  * Replacement object for `MimeTypeArray` that lets us install new fake mime
  * types.
@@ -162,25 +169,25 @@ export const FLASH_PLUGIN = new RufflePlugin(
 );
 
 FLASH_PLUGIN.install({
-    type: "application/futuresplash",
+    type: FUTURESPLASH_MIMETYPE,
     description: "Shockwave Flash",
     suffixes: "spl",
     enabledPlugin: FLASH_PLUGIN,
 });
 FLASH_PLUGIN.install({
-    type: "application/x-shockwave-flash",
+    type: FLASH_MIMETYPE,
     description: "Shockwave Flash",
     suffixes: "swf",
     enabledPlugin: FLASH_PLUGIN,
 });
 FLASH_PLUGIN.install({
-    type: "application/x-shockwave-flash2-preview",
+    type: FLASH7_AND_8_MIMETYPE,
     description: "Shockwave Flash",
     suffixes: "swf",
     enabledPlugin: FLASH_PLUGIN,
 });
 FLASH_PLUGIN.install({
-    type: "application/vnd.adobe.flash-movie",
+    type: FLASH_MOVIE_MIMETYPE,
     description: "Shockwave Flash",
     suffixes: "swf",
     enabledPlugin: FLASH_PLUGIN,

web/packages/core/src/ruffle-player.ts

@@ -19,7 +19,7 @@ import { swfFileName } from "./swf-file-name";
 export const FLASH_MIMETYPE = "application/x-shockwave-flash";
 export const FUTURESPLASH_MIMETYPE = "application/futuresplash";
 export const FLASH7_AND_8_MIMETYPE = "application/x-shockwave-flash2-preview";
-export const FLASH_MOVIE_MIMETYPE = "application/vnd.adobe.flash-movie";
+export const FLASH_MOVIE_MIMETYPE = "application/vnd.adobe.flash.movie";
 export const FLASH_ACTIVEX_CLASSID =
     "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 

web/packages/extension/src/content.ts

@@ -143,7 +143,7 @@ function isXMLDocument(): boolean {
     // Unfortunately, this might still be too late for some websites when using Chrome (issue #969).
     // TODO: use plugin-polyfill.ts
     injectScriptRaw(
-        '(function(){class RuffleMimeType{constructor(a,b,c){this.type=a,this.description=b,this.suffixes=c}}class RuffleMimeTypeArray{constructor(a){this.__mimetypes=[],this.__named_mimetypes={};for(let b of a)this.install(b)}install(a){let b=this.__mimetypes.length;this.__mimetypes.push(a),this.__named_mimetypes[a.type]=a,this[a.type]=a,this[b]=a}item(a){return this.__mimetypes[a]}namedItem(a){return this.__named_mimetypes[a]}get length(){return this.__mimetypes.length}}class RufflePlugin extends RuffleMimeTypeArray{constructor(a,b,c,d){super(d),this.name=a,this.description=b,this.filename=c}install(a){a.enabledPlugin||(a.enabledPlugin=this),super.install(a)}}class RufflePluginArray{constructor(a){this.__plugins=[],this.__named_plugins={};for(let b of a)this.install(b)}install(a){let b=this.__plugins.length;this.__plugins.push(a),this.__named_plugins[a.name]=a,this[a.name]=a,this[b]=a}item(a){return this.__plugins[a]}namedItem(a){return this.__named_plugins[a]}refresh(){}get length(){return this.__plugins.length}}const FLASH_PLUGIN=new RufflePlugin("Shockwave Flash","Shockwave Flash 32.0 r0","ruffle.js",[new RuffleMimeType("application/futuresplash","Shockwave Flash","spl"),new RuffleMimeType("application/x-shockwave-flash","Shockwave Flash","swf"),new RuffleMimeType("application/x-shockwave-flash2-preview","Shockwave Flash","swf"),new RuffleMimeType("application/vnd.adobe.flash-movie","Shockwave Flash","swf")]);function install_plugin(a){navigator.plugins.install||Object.defineProperty(navigator,"plugins",{value:new RufflePluginArray(navigator.plugins),writable:!1}),navigator.plugins.install(a),0<a.length&&!navigator.mimeTypes.install&&Object.defineProperty(navigator,"mimeTypes",{value:new RuffleMimeTypeArray(navigator.mimeTypes),writable:!1});for(var b=0;b<a.length;b+=1)navigator.mimeTypes.install(a[b])}install_plugin(FLASH_PLUGIN);})();'
+        '(function(){class RuffleMimeType{constructor(a,b,c){this.type=a,this.description=b,this.suffixes=c}}class RuffleMimeTypeArray{constructor(a){this.__mimetypes=[],this.__named_mimetypes={};for(let b of a)this.install(b)}install(a){let b=this.__mimetypes.length;this.__mimetypes.push(a),this.__named_mimetypes[a.type]=a,this[a.type]=a,this[b]=a}item(a){return this.__mimetypes[a]}namedItem(a){return this.__named_mimetypes[a]}get length(){return this.__mimetypes.length}}class RufflePlugin extends RuffleMimeTypeArray{constructor(a,b,c,d){super(d),this.name=a,this.description=b,this.filename=c}install(a){a.enabledPlugin||(a.enabledPlugin=this),super.install(a)}}class RufflePluginArray{constructor(a){this.__plugins=[],this.__named_plugins={};for(let b of a)this.install(b)}install(a){let b=this.__plugins.length;this.__plugins.push(a),this.__named_plugins[a.name]=a,this[a.name]=a,this[b]=a}item(a){return this.__plugins[a]}namedItem(a){return this.__named_plugins[a]}refresh(){}get length(){return this.__plugins.length}}const FLASH_PLUGIN=new RufflePlugin("Shockwave Flash","Shockwave Flash 32.0 r0","ruffle.js",[new RuffleMimeType("application/futuresplash","Shockwave Flash","spl"),new RuffleMimeType("application/x-shockwave-flash","Shockwave Flash","swf"),new RuffleMimeType("application/x-shockwave-flash2-preview","Shockwave Flash","swf"),new RuffleMimeType("application/vnd.adobe.flash.movie","Shockwave Flash","swf")]);function install_plugin(a){navigator.plugins.install||Object.defineProperty(navigator,"plugins",{value:new RufflePluginArray(navigator.plugins),writable:!1}),navigator.plugins.install(a),0<a.length&&!navigator.mimeTypes.install&&Object.defineProperty(navigator,"mimeTypes",{value:new RuffleMimeTypeArray(navigator.mimeTypes),writable:!1});for(var b=0;b<a.length;b+=1)navigator.mimeTypes.install(a[b])}install_plugin(FLASH_PLUGIN);})();'
     );
 
     await injectScriptURL(utils.runtime.getURL(`dist/ruffle.js?id=${ID}`));