More cleanup; BlockedFS -> SQLiteFS

README.md

@@ -37,7 +37,7 @@ The following code will get you up and running:
 
 ```js
 import initSqlJS from '@jlongster/sql.js';
-import { BlockedFS } from 'absurd-sql.js-backend';
+import { SqliteFS } from 'absurd-sql.js-backend';
 import IndexedDBBackend from 'absurd-sql.js-backend/dist/indexeddb-backend');
 
 async function run() {
@@ -46,7 +46,7 @@ async function run() {
 
  // Create the backend and filesystem
  let backend = new IndexedDBBackend(4096);
- let BFS = new BlockedFS(SQL.FS, backend);
+ let BFS = new SqliteFS(SQL.FS, backend);
 
  // For now, we need to initialize some internal state. This
  // API will be improved

src/examples/fts/main.js

@@ -42,8 +42,6 @@ function init() {
  });
 
  worker.postMessage({ type: 'ui-invoke', name: 'count' });
-
- supportNestedWorkers(worker);
 }
 
 let methods = ['load'];

src/examples/fts/main.worker.js

@@ -1,5 +1,5 @@
 import initSqlJs from '@jlongster/sql.js';
-import { BlockedFS } from '../..';
+import { SQLiteFS } from '../..';
 import * as uuid from 'uuid';
 import MemoryBackend from '../../memory/backend';
 import IndexedDBBackend from '../../indexeddb/backend';
@@ -12,30 +12,19 @@ let pageSize = 4096;
 let dbName = `fts.sqlite`;
 
 let idbBackend = new IndexedDBBackend(4096 * 2);
-let BFS;
+let sqlFS;
 
 // Helper methods
 
 let SQL = null;
 let ready = null;
 async function _init() {
  SQL = await initSqlJs({ locateFile: file => file });
- BFS = new BlockedFS(SQL.FS, idbBackend);
- SQL.register_for_idb(BFS);
-
- try {
- await BFS.init();
- } catch (e) {
- if (e.message.includes('SharedArrayBuffer')) {
- output(
- '<code>SharedArrayBuffer</code> is not available in your browser. It is required, but in the future we will provide a fallback.'
- );
- }
- throw e;
- }
+ sqlFS = new SQLiteFS(SQL.FS, idbBackend);
+ SQL.register_for_idb(sqlFS);
 
  SQL.FS.mkdir('/blocked');
- SQL.FS.mount(BFS, {}, '/blocked');
+ SQL.FS.mount(sqlFS, {}, '/blocked');
 }
 
 function init() {

src/examples/large-data/main.worker.js

@@ -1,5 +1,5 @@
 import initSqlJs from '@jlongster/sql.js/dist/sql-wasm-debug.js';
-import { BlockedFS } from '../..';
+import { SQLiteFS } from '../..';
 import * as uuid from 'uuid';
 import MemoryBackend from '../../memory/backend';
 import IndexedDBBackend from '../../indexeddb/backend';
@@ -15,16 +15,16 @@ let recordProfile = false;
 
 let memoryBackend = new MemoryBackend({});
 let idbBackend = new IndexedDBBackend();
-let BFS;
+let sqlFS;
 
 // Helper methods
 
 let SQL = null;
 async function init() {
  if (SQL == null) {
  SQL = await initSqlJs({ locateFile: file => file });
- BFS = new BlockedFS(SQL.FS, idbBackend);
- SQL.register_for_idb(BFS);
+ sqlFS = new SQLiteFS(SQL.FS, idbBackend);
+ SQL.register_for_idb(sqlFS);
 
  if (typeof SharedArrayBuffer === 'undefined') {
  output(
@@ -33,7 +33,7 @@ async function init() {
  }
 
  SQL.FS.mkdir('/blocked');
- SQL.FS.mount(BFS, {}, '/blocked');
+ SQL.FS.mount(sqlFS, {}, '/blocked');
  }
 }
 
@@ -108,13 +108,13 @@ async function populate() {
  let db = await getDatabase();
 
  if (recordProfile) {
- BFS.backend.startProfile();
+ sqlFS.backend.startProfile();
  }
 
  queries.populate(db, output, uuid, count);
 
  if (recordProfile) {
- BFS.backend.stopProfile();
+ sqlFS.backend.stopProfile();
  }
 
  let { node } = SQL.FS.lookupPath(`/blocked/${dbName}`);
@@ -132,26 +132,26 @@ async function populate() {
 async function countAll() {
  let db = await getDatabase();
  if (recordProfile) {
- BFS.backend.startProfile();
+ sqlFS.backend.startProfile();
  }
 
  queries.countAll(db, output);
 
  if (recordProfile) {
- BFS.backend.stopProfile();
+ sqlFS.backend.stopProfile();
  }
 }
 
 async function randomReads() {
  let db = await getDatabase();
  if (recordProfile) {
- BFS.backend.startProfile();
+ sqlFS.backend.startProfile();
  }
 
  queries.randomReads(db, output);
 
  if (recordProfile) {
- BFS.backend.stopProfile();
+ sqlFS.backend.stopProfile();
  }
 }
 
@@ -220,9 +220,9 @@ if (typeof self !== 'undefined') {
  // We dont really support swapping the backend like this,
  // but it works for the demo
  if (currentBackendType === 'memory') {
- BFS.backend = memoryBackend;
+ sqlFS.backend = memoryBackend;
  } else {
- BFS.backend = idbBackend;
+ sqlFS.backend = idbBackend;
  }
  break;
 

src/index.js

@@ -1,4 +1,4 @@
-import _BlockedFS from './blocked-fs';
+import _SQLiteFS from './sqlite-fs';
 
 // Right now we don't support `export from` so we do this manually
-export const BlockedFS = _BlockedFS;
+export const SQLiteFS = _SQLiteFS;

src/indexeddb/backend.js

@@ -1,4 +1,4 @@
-import { File } from '../blocked-file';
+import { File } from '../sqlite-file';
 import * as perf from 'perf-deets';
 import { LOCK_TYPES, getPageSize, isSafeToWrite } from '../sqlite-util';
 import { FileOps } from './file-ops';

src/memory/backend.js

@@ -1,4 +1,4 @@
-import { File } from '../blocked-file';
+import { File } from '../sqlite-file';
 
 class FileOps {
  constructor(filename, meta = null, data) {

src/blocked-fs.js → src/sqlite-fs.js

@@ -6,13 +6,13 @@ const ERRNO_CODES = {
 // This implements an emscripten-compatible filesystem that is means
 // to be mounted to the one from `sql.js`. Example:
 //
-// let BFS = new BlockedFS(SQL.FS, idbBackend);
+// let BFS = new SQLiteFS(SQL.FS, idbBackend);
 // SQL.FS.mount(BFS, {}, '/blocked');
 //
 // Now any files created under '/blocked' will be handled by this
 // filesystem, which creates a special file that handles read/writes
 // in the way that we want.
-export default class BlockedFS {
+export default class SQLiteFS {
  constructor(FS, backend) {
  this.FS = FS;
  this.backend = backend;