Michel2/emularity
1
0
Fork 0
mirror of https://github.com/db48x/emularity.git synced 2026-07-27 19:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the IndexedDB issue that breaks game loads in some cases (including private browsing mode)

Browse Source
This commit is contained in:
Daniel Brooks
2016-08-09 21:05:09 -07:00
parent 476dd351aa
commit e7f842d72a
4 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.be/2363771f-d1db-495b-a6b7-259458ee6316/bugs/661102c8-ca14-4b62-9e70-76257c3c3d72/comments/640b9d9e-6bf1-4c53-bb02-5a4fa2278ab7/body
+3
View File
@@ -0,0 +1,3 @@
jvilk cracked it, and found a way to test it on demand
his hunch was right on the money
.be/2363771f-d1db-495b-a6b7-259458ee6316/bugs/661102c8-ca14-4b62-9e70-76257c3c3d72/comments/640b9d9e-6bf1-4c53-bb02-5a4fa2278ab7/values
+29
View File
@@ -0,0 +1,29 @@
{
"Author": "Daniel Brooks <db48x@db48x.net>",
"Content-type": "text/plain",
"Date": "Wed, 10 Aug 2016 04:04:34 +0000"
}
.be/2363771f-d1db-495b-a6b7-259458ee6316/bugs/661102c8-ca14-4b62-9e70-76257c3c3d72/values
+1 -1
View File
@@ -26,7 +26,7 @@
"status": "open",
"status": "fixed",
loader.js
+46 -37
View File
@@ -807,16 +807,20 @@ var Module = null;
}
loading.then(function (_game_data) {
return new Promise(function(resolve, reject) {
var deltaFS = new BrowserFS.FileSystem.InMemory();
var inMemoryFS = new BrowserFS.FileSystem.InMemory();
// If the browser supports IndexedDB storage, mirror writes to that storage
// for persistence purposes.
if (BrowserFS.FileSystem.IndexedDB.isAvailable()) {
var AsyncMirrorFS = BrowserFS.FileSystem.AsyncMirror,
IndexedDB = BrowserFS.FileSystem.IndexedDB;
deltaFS = new AsyncMirrorFS(deltaFS,
deltaFS = new AsyncMirrorFS(inMemoryFS,
new IndexedDB(function(e, fs) {
if (e) {
// we probably weren't given access; private window for example. don't fail completely, just don't use indexeddb
// we probably weren't given access;
// private window for example.
// don't fail completely, just don't
// use indexeddb
deltaFS = inMemoryFS;
finish();
} else {
// Initialize deltaFS by copying files from async storage to sync storage.
@@ -844,45 +848,50 @@ var Module = null;
game_data.fs = new BrowserFS.FileSystem.OverlayFS(deltaFS,
new BrowserFS.FileSystem.MountableFileSystem());
game_data.fs.initialize(function (e) {
var Buffer = BrowserFS.BFSRequire('buffer').Buffer;
if (e) {
console.error("Failed to initialize the OverlayFS:", e);
reject();
} else {
var Buffer = BrowserFS.BFSRequire('buffer').Buffer;
function fetch(file) {
if ('data' in file && file.data !== null && typeof file.data !== 'undefined') {
return Promise.resolve(file.data);
function fetch(file) {
if ('data' in file && file.data !== null && typeof file.data !== 'undefined') {
return Promise.resolve(file.data);
}
return fetch_file(file.title, file.url, 'arraybuffer', file.optional);
}
return fetch_file(file.title, file.url, 'arraybuffer', file.optional);
}
function mountat(drive) {
return function (data) {
if (data !== null) {
drive = drive.toLowerCase();
var mountpoint = '/'+ drive;
// Mount into RO MFS.
game_data.fs.getOverlayedFileSystems().readable.mount(mountpoint, BFSOpenZip(new Buffer(data)));
}
};
}
function mountat(drive) {
return function (data) {
if (data !== null) {
drive = drive.toLowerCase();
var mountpoint = '/'+ drive;
// Mount into RO MFS.
game_data.fs.getOverlayedFileSystems().readable.mount(mountpoint, BFSOpenZip(new Buffer(data)));
}
};
}
function saveat(filename) {
return function (data) {
if (data !== null) {
game_data.fs.writeFileSync('/'+ filename, new Buffer(data), null, flag_w, 0x1a4);
}
};
}
Promise.all(game_data.files
.map(function (f) {
if (f && f.file) {
if (f.drive) {
return fetch(f.file).then(mountat(f.drive));
} else if (f.mountpoint) {
return fetch(f.file).then(saveat(f.mountpoint));
function saveat(filename) {
return function (data) {
if (data !== null) {
game_data.fs.writeFileSync('/'+ filename, new Buffer(data), null, flag_w, 0x1a4);
}
};
}
Promise.all(game_data.files
.map(function (f) {
if (f && f.file) {
if (f.drive) {
return fetch(f.file).then(mountat(f.drive));
} else if (f.mountpoint) {
return fetch(f.file).then(saveat(f.mountpoint));
}
}
}
return null;
}))
.then(resolve, reject);
return null;
}))
.then(resolve, reject);
}
});
}
});