xrsh
/
xrsh-com
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor beautify: worker['emulator.foo'](..) => worker.foo(..)
/ mirror_to_github (push) Successful in 21s Details
/ test (push) Successful in 3s Details

This commit is contained in:
Leon van Kammen 2024-11-01 16:39:56 +00:00
parent 277dafbd36
commit de8883673c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com/codemirror.js
View File

@ -109,7 +109,7 @@ AFRAME.registerComponent('codemirror', {
// we don't do via shellcmd: isoterminal.exec(`echo '${str}' > ${file}`,1) // we don't do via shellcmd: isoterminal.exec(`echo '${str}' > ${file}`,1)
// as it would require all kindof ugly stringescaping // as it would require all kindof ugly stringescaping
console.log("updating "+file) console.log("updating "+file)
await this.isoterminal.worker['emulator.update_file'](file, this.isoterminal.convert.toUint8Array(str) ) await this.isoterminal.worker.update_file(file, this.isoterminal.convert.toUint8Array(str) )
}, },
events:{ events:{
@ -117,7 +117,7 @@ AFRAME.registerComponent('codemirror', {
// component events // component events
DOMready: function(e){ DOMready: function(e){
this.isoterminal.worker['emulator.read_file'](this.data.file) this.isoterminal.worker.read_file(this.data.file)
.then( this.isoterminal.convert.Uint8ArrayToString ) .then( this.isoterminal.convert.Uint8ArrayToString )
.then( (str) => { .then( (str) => {
console.log("creating editor") console.log("creating editor")

8
com/isoterminal/feat/autorestore.js
View File

@ -2,7 +2,7 @@ if( typeof emulator != 'undefined' ){
// inside worker-thread // inside worker-thread
importScripts("localforage.js") // we don't instance it again here (just use its functions) importScripts("localforage.js") // we don't instance it again here (just use its functions)
this['emulator.restore_state'] = async function(data){ this.restore_state = async function(data){
return new Promise( (resolve,reject) => { return new Promise( (resolve,reject) => {
localforage.getItem("state", async (err,stateBase64) => { localforage.getItem("state", async (err,stateBase64) => {
if( stateBase64 && !err ){ if( stateBase64 && !err ){
@ -14,7 +14,7 @@ if( typeof emulator != 'undefined' ){
}) })
}) })
} }
this['emulator.save_state'] = async function(){ this.save_state = async function(){
console.log("saving session") console.log("saving session")
let state = await emulator.save_state() let state = await emulator.save_state()
localforage.setDriver([ localforage.setDriver([
@ -46,7 +46,7 @@ if( typeof emulator != 'undefined' ){
if( stateBase64 && !err && confirm('continue last session?') ){ if( stateBase64 && !err && confirm('continue last session?') ){
this.noboot = true // see feat/boot.js this.noboot = true // see feat/boot.js
try{ try{
await this.worker['emulator.restore_state']() await this.worker.restore_state()
// simulate / fastforward boot events // simulate / fastforward boot events
this.postBoot( () => { this.postBoot( () => {
this.send("l\n") this.send("l\n")
@ -57,7 +57,7 @@ if( typeof emulator != 'undefined' ){
}) })
this.save = async () => { this.save = async () => {
await this.worker['emulator.save_state']() await this.worker.save_state()
} }
window.addEventListener("beforeunload", function (e) { window.addEventListener("beforeunload", function (e) {

8
com/isoterminal/worker.js
View File

@ -42,10 +42,10 @@ this.runISO = function(opts){
/* /*
* forward events/functions so non-worker world can reach them * forward events/functions so non-worker world can reach them
*/ */
this['emulator.create_file'] = async function(){ return emulator.create_file.apply(emulator, arguments[0]) } this.create_file = async function(){ return emulator.create_file.apply(emulator, arguments[0]) }
this['emulator.read_file'] = async function(){ return emulator.read_file.apply(emulator, arguments[0]) } this.read_file = async function(){ return emulator.read_file.apply(emulator, arguments[0]) }
this['emulator.append_file'] = async function(){ emulator.fs9p.append_file.apply(emulator.fs9p, arguments[0]) } this.append_file = async function(){ emulator.fs9p.append_file.apply(emulator.fs9p, arguments[0]) }
this['emulator.update_file'] = async function(){ emulator.fs9p.update_file.apply(emulator.fs9p, arguments[0]) } this.update_file = async function(){ emulator.fs9p.update_file.apply(emulator.fs9p, arguments[0]) }
// filename will be read from 9pfs: "/mnt/"+filename // filename will be read from 9pfs: "/mnt/"+filename
emulator.readFromPipe = function(filename,cb){ emulator.readFromPipe = function(filename,cb){