Version 0.0.3

Author: ceifa

.gitignore

@@ -1 +1,2 @@
-node_modules/
+node_modules/
+bench/

README.md

@@ -44,8 +44,7 @@ http.createServer(async(function (req, res)
     sleep(1000):await()
 
     res:write('Hello World!');
-    -- because end is a lua keyword you have to put the '_'
-    res:_end();
+    res['end']();
 end)):listen(port);
 
 print('Your server is running on port ' .. port .. '!')

example/main.lua

@@ -1,23 +1,22 @@
 #!/usr/bin/env demoon
--- you can require JS module files
-local jssleep = require('./sleep.js')
--- you can require node modules
+-- you can require node modules (package.json/node_modules works as well)
 local http = require('http')
--- you can require Lua files
+
+-- you can require js modules and lua files
+local jssleep = require('./sleep.js')
 local luasleep = require('sleep.lua')
 
 local port = os.getenv('PORT') or 8080
 
--- yes, we have top level await
+-- top level await works!
 luasleep(1000):await()
 
--- create a server object:
 http.createServer(async(function (req, res)
     -- you can await inside async bounded functions
     jssleep(1000):await()
 
-    res:write('Hello World!'); -- write a response to the client
-    res['end'](); -- end the response
-end)):listen(port); -- the server object listens on port 8080
+    res:write('Hello World!');
+    res['end']();
+end)):listen(port);
 
 print('Your server is running on port ' .. port .. '!')

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "demoon",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Lua + Node",
   "main": "src/index.js",
   "bin": {
@@ -13,6 +13,6 @@
     "lua"
   ],
   "dependencies": {
-    "wasmoon": "1.6.1"
+    "wasmoon": "1.7.0"
   }
 }

package.json

@@ -1,35 +1,39 @@
 const { LuaFactory } = require('wasmoon')
 const path = require('path')
-const { walk } = require('./file')
 const fs = require('fs').promises
 
-const registerDirectory = async (factory, dir) => {
-    for await (const file of walk(dir)) {
-        await factory.mountFile(file, await fs.readFile(file))
-    }
-}
-
 const start = async (entryFile) => {
-    const factory = new LuaFactory()
-
-    await factory.mountFile(path.resolve(process.cwd(), entryFile), await fs.readFile(entryFile))
-    await registerDirectory(factory, path.resolve(__dirname, "std"))
-
-    const lua = await factory.createEngine({ injectObjects: true })
-
-    lua.global.set('new', (constructor, ...args) => new constructor(...args))
-    lua.global.set('global', global)
-    lua.global.set('mountFile', factory.mountFileSync.bind(factory))
-    lua.global.set('jsRequire', (modulename, metaDirectory) => {
-            if (modulename.startsWith('.')) {
-                modulename = path.resolve(metaDirectory, '..', modulename)
-            }
-
-            return require(modulename)
-        })
-
-    await lua.doFile(path.resolve(__dirname, "std/main.lua"))
-    await lua.doFile(path.resolve(process.cwd(), entryFile))
+    const factory = new LuaFactory(undefined, process.env)
+
+    const fullEntryFile = path.resolve(process.cwd(), entryFile)
+    const fullStdFile = path.resolve(__dirname, "std.lua")
+
+    await factory.mountFile(fullEntryFile, await fs.readFile(fullEntryFile))
+    await factory.mountFile(fullStdFile, await fs.readFile(fullStdFile))
+
+    const engine = await factory.createEngine({ injectObjects: true })
+
+    engine.global.set('new', (constructor, ...args) => new constructor(...args))
+    engine.global.set('global', global)
+    engine.global.set('mountFile', factory.mountFileSync.bind(factory))
+    engine.global.set('jsRequire', (modulename, metaDirectory) => {
+        if (modulename.startsWith('.')) {
+            modulename = path.resolve(metaDirectory, '..', modulename)
+        }
+
+        return require(modulename)
+    })
+
+    try {
+        engine.doFileSync(fullStdFile)
+    
+        const thread = engine.global.newThread()
+        thread.loadFile(fullEntryFile)
+    
+        await thread.run(0)
+    } catch (e) {
+        console.error(e)
+    }
 }
 
 module.exports = { start }

src/file.js

@@ -1,3 +1,13 @@
+local path = jsRequire("path")
+local fs = jsRequire("fs")
+
+function tick(co)
+    if coroutine.status(co) == "suspended" then
+        coroutine.resume(co)
+        setImmediate(tick, co)
+    end
+end
+
 -- async function to bound awaits
 function async(callback)
     return function(...)
@@ -14,26 +24,14 @@ function async(callback)
                 end
             end)
 
-            function tick()
-                local status = coroutine.status(co)
-
-                if status == "suspended" then
-                    coroutine.resume(co)
-                    setImmediate(tick)
-                end
-            end
-
-            tick()
+            tick(co)
         end)
     end
 end
 
 -- package searcher to handle lua files on the fly
 table.insert(package.searchers, function(moduleName)
     if moduleName:sub(-4) == ".lua" then
-        local path = jsRequire("path")
-        local fs = jsRequire("fs")
-
         local calledDirectory = debug.getinfo(3).short_src
         local luafile = path.resolve(calledDirectory, "..", moduleName)
 
@@ -51,11 +49,6 @@ table.insert(package.searchers, function(moduleName)
     if success then return function() return result end end
 end)
 
--- replace the origin getenv by the nodejs one
-function os.getenv(varname)
-    return process.env[varname]
-end
-
 -- set the nodejs global as fallback to default lua global
 setmetatable(_G, {
     __index = function(t, k) return global[k] end