|
@@ -27,25 +27,25 @@ type InitWAVM struct {
|
|
|
appName string
|
|
|
}
|
|
|
|
|
|
-func NewInitWAVM(ctx context.Context, api *InitWAVMHostAPI, ngRoot string, appName string, logger *hiedalog.HiedaLogger) (*InitWAVM, error) {
|
|
|
- ok, err := pathutils.PathExists(ngRoot)
|
|
|
+func NewInitWAVM(ctx context.Context, api *InitWAVMHostAPI, fsRoot string, appName string, logger *hiedalog.HiedaLogger) (*InitWAVM, error) {
|
|
|
+ ok, err := pathutils.PathExists(fsRoot)
|
|
|
if err != nil {
|
|
|
return nil, fmt.Errorf("failed check if NAGAE_ROV_ROOT is exists: %w", err)
|
|
|
}
|
|
|
if !ok {
|
|
|
- return nil, fmt.Errorf("NAGAE_ROV_ROOT '%s' not exists", ngRoot)
|
|
|
+ return nil, fmt.Errorf("root path '%s' not exists", fsRoot)
|
|
|
}
|
|
|
- pcache := path.Join(ngRoot, "cache", "wasm", "openngvfs", "app", appName)
|
|
|
+ pcache := path.Join(fsRoot, "cache", "wasm", "openngvfs", "app", appName)
|
|
|
err = pathutils.MkDirIfNotExist(pcache, 0755)
|
|
|
if !ok {
|
|
|
return nil, fmt.Errorf("failed create dir '%s' for wasm cache: %w", pcache, err)
|
|
|
}
|
|
|
- pwar := path.Join(ngRoot, "misc", "wasm", "common", "osfs")
|
|
|
+ pwar := path.Join(fsRoot, "misc", "wasm", "common", "osfs")
|
|
|
err = pathutils.MkDirIfNotExist(pwar, 0755)
|
|
|
if !ok {
|
|
|
return nil, fmt.Errorf("failed create dir '%s' for wasm common osfs: %w", pcache, err)
|
|
|
}
|
|
|
- fscfgRoot := path.Join(ngRoot, "syscfg", "openngvfs")
|
|
|
+ fscfgRoot := path.Join(fsRoot, "syscfg", "openngvfs")
|
|
|
fstabPath := path.Join(fscfgRoot, "fstab.toml")
|
|
|
waRoot := path.Join(fscfgRoot, "wasm")
|
|
|
fsTab, err := loadFsTab(fstabPath)
|
|
@@ -74,10 +74,10 @@ func NewInitWAVM(ctx context.Context, api *InitWAVMHostAPI, ngRoot string, appNa
|
|
|
WithFSConfig(wafscfg).
|
|
|
WithStderr(pStderr).
|
|
|
WithStdout(pStdout).
|
|
|
- WithEnv("NAGAE_ROV_ROOT", ngRoot).
|
|
|
+ WithEnv("NAGAE_ROV_ROOT", fsRoot).
|
|
|
WithEnv("NAGAE_APP_NAME", appName)
|
|
|
mainModCompiled, err := rt.CompileModule(ctx, wasmBin)
|
|
|
- hostModuleBuilder := rt.NewHostModuleBuilder("openngvfs_init")
|
|
|
+ hostModuleBuilder := rt.NewHostModuleBuilder("ngvfs_init")
|
|
|
apiAdapter := NewInitWAVMHostModuleAdapter(hostModuleBuilder, api, fsTab, logger, appName)
|
|
|
if err != nil {
|
|
|
return nil, fmt.Errorf("failed compile wasm code: %w", err)
|