From 34b76c30709278d8a2255b61941f279763bf6869 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 27 Jan 2024 19:53:12 +0800 Subject: [PATCH 001/125] doc: update README.md --- README.md | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 25a04c4..b685263 100755 --- a/README.md +++ b/README.md @@ -10,12 +10,12 @@ For previous mature version, please explore source code on ## Rewrite Progress -[x] migrate kotlin service code -[x] implement windows adapter for MethodChannel and EventChannel -[ ] rewrite new design UI in dart -[ ] implement linux adapter -[ ] implement macosx adapter -[ ] implement web+ios adapter +- [x] migrate kotlin service code +- [x] implement windows adapter for MethodChannel and EventChannel +- [ ] rewrite new design UI in dart +- [ ] implement linux adapter +- [ ] implement macosx adapter +- [ ] implement web+ios adapter ## How to use @@ -72,13 +72,14 @@ This project is a starting point for a Flutter application. A few resources to get you started if this is your first Flutter project: -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, samples, guidance on mobile development, and a full API reference. + ##### NodeJS/Python binary for ARM ref: https://github.com/dna2github/dna2oslab/releases/tag/0.2.0-android-gt6-arm @@ -131,25 +132,3 @@ create a new platform in NodeBase and download go wrapper from `file:///sdcard/g then write a tiny server to have a try. ref: https://github.com/stallpool/halfbase/blob/master/golang/tinyserver/main.go -##### Notice - -currently NodeBase support kill a program with 1-level children, for example `go run main.go` will spawn a child process `main`; -if click on `stop` button, NodeBase can kill the `go run` and its child `main`. - -if remove `exec` in the `go` wrapper shell script, the shell script will run in `sh`, it spawn `go run` and the `go run` spawn `main`; -when `stop` the application, NodeBase will merely kill `sh` and its child `go run`; but `main` will still be running there, -which may cause next `start` failure (like port has already been used) and need to kill whole NodeBase for cleanup. - -## Flutter Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. - From 450398ac96e7ddc20c0f52ddc2e06cadc4eb0fa7 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 28 Jan 2024 17:50:40 +0800 Subject: [PATCH 002/125] dart: add trackable cancelable download function --- lib/util/fs.dart | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 345a2e7..e9de975 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -1,3 +1,6 @@ +import 'dart:async'; + +import 'package:flutter/cupertino.dart'; import 'package:path_provider/path_provider.dart'; import 'package:archive/archive.dart'; import 'package:path/path.dart' as path; @@ -167,3 +170,68 @@ Future fsDownload(String filename, String url) async { } } +Future fsProgressDownload( + String filename, String url, + StreamController progressToken, + StreamController cancelToken) async { + // ref: filled by GPT 4 turbo and optimized + final httpClient = HttpClient(); + try { + // Parse the URL + final uri = Uri.parse(url); + // Open a request + final request = await httpClient.getUrl(uri); + // Send the request + final response = await request.close(); + + // Check if the response is OK (status code 200) + if (response.statusCode == 200) { + // Get the total length of the file + final contentLength = response.contentLength; + int downloadedLength = 0; + + // Create a new file (overwrite if exists) + final file = File(filename); + final fileSink = file.openWrite(); + + // Listen for response data + final subscription = response.listen( + (List chunk) { + // Update the downloaded length + downloadedLength += chunk.length; + // Write the chunk to file + fileSink.add(chunk); + + // Calculate and print the download progress + double progress_rate = downloadedLength / contentLength!; + progressToken.add([downloadedLength, contentLength, progress_rate]); + debugPrint('Download progress: ${(progress_rate * 100).toStringAsFixed(2)}%'); + }, + onDone: () async { + // Close the fileSink to ensure all bytes are written + await fileSink.close(); + debugPrint('Download completed: $filename'); + }, + onError: (e) { + debugPrint('Error: $e'); + }, + cancelOnError: true, + ); + + cancelToken.stream.listen((_) { + subscription.cancel(); + fileSink.close(); + httpClient.close(); + }); + } else { + debugPrint('Error: Server returned status code ${response.statusCode}'); + } + } catch (e) { + debugPrint('Error: $e'); + } finally { + progressToken.close(); + cancelToken.close(); + httpClient.close(); + } +} + From cefba142d7fa6926efc2215a095399f1fadb9217 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 28 Jan 2024 23:05:48 +0800 Subject: [PATCH 003/125] asset: add logo image --- asset/image/logo.png | Bin 0 -> 3173 bytes pubspec.yaml | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 asset/image/logo.png diff --git a/asset/image/logo.png b/asset/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3a6aa2abfa7356272e613da56ff82696e9043f0f GIT binary patch literal 3173 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 Date: Sun, 28 Jan 2024 23:06:38 +0800 Subject: [PATCH 004/125] dart: add nodebase splash screen --- lib/page/splash.dart | 79 ++++++++++++++++++++++++++++++++++++++++++++ lib/util/event.dart | 3 ++ 2 files changed, 82 insertions(+) create mode 100755 lib/page/splash.dart create mode 100755 lib/util/event.dart diff --git a/lib/page/splash.dart b/lib/page/splash.dart new file mode 100755 index 0000000..c972d61 --- /dev/null +++ b/lib/page/splash.dart @@ -0,0 +1,79 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import '../util/event.dart' as event; + +class SplashPage extends StatefulWidget { + const SplashPage({super.key}); + + @override + State createState() => _SplashPageState(); +} + +class _SplashPageState extends State { + late StreamSubscription initListener; + Completer initCompleter = Completer(); + + @override + void initState() { + super.initState(); + // TODO: trigger app init process in controller service + initListener = event.initializeToken.stream.listen((event) { + if (!initCompleter.isCompleted) { + initCompleter.complete(); + } + }); + splashWait().then((_) { + // TODO: go to correct page according to current state + // Navigator.pushAndRemoveUntil( + // context, + // MaterialPageRoute(builder: (context) => NextPage()), + // (Route route) => false, + // ) + }); + // debug: Future.delayed(const Duration(seconds: 8)).then((_) => event.initializeToken.add(true)); + } + + @override + void dispose() { + initListener.cancel(); + super.dispose(); + } + + Future splashWait() async { + // at least, splash wait for N seconds, N = 3 + // at least, guarantee init complete + Future delay = Future.delayed(const Duration(seconds: 3)); + await Future.any([initCompleter.future, delay]); + if (initCompleter.isCompleted) { + await delay; + } else { + await initCompleter.future; + } + } + + @override + Widget build(BuildContext context) { + // TODO: implement build + return const Scaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image(image: AssetImage('asset/image/logo.png')), + Text( + "\nNodeBase", + style: TextStyle(fontSize: 24, color: Color.fromARGB(128, 0, 0, 0)), + ), + Text( + "Connect the world with friends", + style: TextStyle(color: Color.fromARGB(65, 0, 0, 0)), + ), + ], + ), + ), + ); + } + +} \ No newline at end of file diff --git a/lib/util/event.dart b/lib/util/event.dart new file mode 100755 index 0000000..b61f58e --- /dev/null +++ b/lib/util/event.dart @@ -0,0 +1,3 @@ +import 'dart:async'; + +final initializeToken = StreamController(); \ No newline at end of file From e33f671334703818c1d8dc6b6222594ed795b866 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 29 Jan 2024 14:30:09 +0800 Subject: [PATCH 005/125] dart: bugfix - use path.join instead of string var --- lib/util/fs.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index e9de975..e81a172 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -53,8 +53,8 @@ Future fsGetEntity(filepath) async { } Future fsMkdir(filepath) async { - final path = await _appPath; - return await Directory("$path$filepath").create(recursive: true); + final base = await _appPath; + return await Directory(path.join(base, filepath)).create(recursive: true); } Future> fsLs(filepath) async { From 8616442a490d100764cf08b9972e73a12cf47d38 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 29 Jan 2024 15:08:37 +0800 Subject: [PATCH 006/125] dart, windows, android: add util.arch to get cpu arch - dart: add get arch interface api - windows: impl get arch via windows api - android: impl get arch via Build --- .../net/seven/nodebase/nodebase/External.java | 33 +++++++++++++++++++ .../seven/nodebase/nodebase/MainActivity.java | 3 ++ lib/util/api.dart | 9 +++++ windows/runner/flutter_dart.h | 29 ++++++++++++++++ 4 files changed, 74 insertions(+) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java b/android/app/src/main/java/net/seven/nodebase/nodebase/External.java index 61f161c..e796c43 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/External.java @@ -3,8 +3,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.os.Build; import java.io.File; +import java.util.ArrayList; public class External { public static void openBrowser(Context context, String url) { @@ -14,6 +16,37 @@ public static void openBrowser(Context context, String url) { context.startActivity(it); } + private static String transformAbiToArch(String name) { + switch(name) { + case "armeabi-v8a": return "arm64"; + case "x86_64": return "x64"; + case "x86": return "x86"; + case "armeabi-v7a": case "armeabi": return "arm"; + // mips, mips64 + } + return "unknown:" + name; + } + public static String getArch() { + ArrayList arch = new ArrayList<>(); + StringBuilder sb = new StringBuilder(); + sb.append("android-"); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + for (String one : Build.SUPPORTED_ABIS) { + arch.add(transformAbiToArch(one)); + } + sb.append(String.join("|", arch)); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) { + // deprecated api + sb.append(transformAbiToArch(Build.CPU_ABI)); + sb.append('|'); + sb.append(transformAbiToArch(Build.CPU_ABI2)); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.DONUT) { + // deprecated api + sb.append(Build.CPU_ABI); + } + return sb.toString(); + } + public static void shareInformation( Context context, String title, diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java index 7510078..e8f8935 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java @@ -90,6 +90,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result fileExecutablize(fname); result.success(true); } + case "util.arch" -> { + result.success(External.getArch()); + } } } }); diff --git a/lib/util/api.dart b/lib/util/api.dart index 01e6be4..ddfdb05 100755 --- a/lib/util/api.dart +++ b/lib/util/api.dart @@ -35,6 +35,15 @@ class NodeBaseApi { } } + static Future apiUtilGetArch() async { + try { + return await api.invokeMethod("util.arch"); + } catch(e) { + log("NodeBase [E] utilGetArch / ${e.toString()}"); + return ""; + } + } + static Future> apiAppStatus(String app) async { /* { state: "none" | "new" | "running" | "dead" diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h index fedc12d..40e50ab 100755 --- a/windows/runner/flutter_dart.h +++ b/windows/runner/flutter_dart.h @@ -315,6 +315,32 @@ void utilBrowserOpen(const std::string &url) { if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; ShellExecuteA(0, 0, url.c_str(), 0, 0 , SW_SHOW ); } +flutter::EncodableValue utilGetArch() { + std::string arch("windows-"); + SYSTEM_INFO si; + // XXX: GetSystemInfo(&si) for old windows, maybe we can use LoadLibrary for test + GetNativeSystemInfo(&si); + switch(si.wProcessorArchitecture) { + // compatible with GetSystemInfo + case PROCESSOR_ARCHITECTURE_AMD64: + arch += "x64|x86"; + break; + case PROCESSOR_ARCHITECTURE_INTEL: + arch += "x86"; + break; + // new + case PROCESSOR_ARCHITECTURE_ARM: + arch += "arm"; + break; + case PROCESSOR_ARCHITECTURE_ARM64: + arch += "arm64|arm"; + break; + case PROCESSOR_ARCHITECTURE_IA64: + arch += "x64|x86"; + break; + } + return flutter::EncodableValue(arch); +} #define RETURN_BADARG_ERR(x) { result->Error("BAD_ARGS", "Invalid argument type for '" #x "'"); return; } void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { @@ -392,6 +418,9 @@ void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { utilBrowserOpen(url); result->Success(); } + else if (call.method_name().compare("util.arch") == 0) { + result->Success(utilGetArch()); + } else { result->NotImplemented(); } From c97bf27996fd696179da8761b028f5c2d3a89647 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 29 Jan 2024 15:18:59 +0800 Subject: [PATCH 007/125] dart: minor - reformat log and add try catch in fs.dart --- lib/util/fs.dart | 96 +++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index e81a172..82ceada 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:path_provider/path_provider.dart'; import 'package:archive/archive.dart'; import 'package:path/path.dart' as path; @@ -26,7 +25,7 @@ Future fsReadAppFileAsString(filepath) async { String contents = await file.readAsString(); return contents; } catch (e) { - log("NodeBase [E] fsReadAppFileAsString / ${e.toString()}"); + log("NodeBase [E] fsReadAppFileAsString ... ${e.toString()}"); return ""; } } @@ -111,50 +110,55 @@ Future fsMoveApp(String app, String newname) async { } Future fsZipFiles(String zipFilename, List files) async { - // TODO: try...catch... - - // Create an empty archive - final archive = Archive(); + try { + // Create an empty archive + final archive = Archive(); + + for (final file in files) { + // Read the file bytes + final bytes = file.readAsBytesSync(); + + // Add the file to the archive + archive.addFile(ArchiveFile( + path.basename(file.path), // File name + bytes.length, // File size + bytes, // File data + )); + } - for (final file in files) { - // Read the file bytes - final bytes = file.readAsBytesSync(); + // Encode the archive to Zip + final zipData = ZipEncoder().encode(archive); - // Add the file to the archive - archive.addFile(ArchiveFile( - path.basename(file.path), // File name - bytes.length, // File size - bytes, // File data - )); + // Write the zipped bytes to a file + File(zipFilename) + ..createSync(recursive: true) // Create the file if it doesn't exist + ..writeAsBytesSync(zipData!); + } catch(e) { + log("NodeBase [E] fsZipFiles ... ${e.toString()}"); } - - // Encode the archive to Zip - final zipData = ZipEncoder().encode(archive); - - // Write the zipped bytes to a file - File(zipFilename) - ..createSync(recursive: true) // Create the file if it doesn't exist - ..writeAsBytesSync(zipData!); } Future fsUnzipFiles(String zipFilename, String dstDir) async { - // TODO: try...catch... - final bytes = File(zipFilename).readAsBytesSync(); - - // Decode the Zip archive - final archive = ZipDecoder().decodeBytes(bytes); - - for (final file in archive) { - final filename = file.name; - if (file.isFile) { - final data = file.content as List; - File(path.join(dstDir, filename)) - ..createSync(recursive: true) - ..writeAsBytesSync(data); - } else { - Directory(path.join(dstDir, filename)) - .createSync(recursive: true); + try { + final bytes = File(zipFilename).readAsBytesSync(); + + // Decode the Zip archive + final archive = ZipDecoder().decodeBytes(bytes); + + for (final file in archive) { + final filename = file.name; + if (file.isFile) { + final data = file.content as List; + File(path.join(dstDir, filename)) + ..createSync(recursive: true) + ..writeAsBytesSync(data); + } else { + Directory(path.join(dstDir, filename)) + .createSync(recursive: true); + } } + } catch (e) { + log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); } } @@ -203,17 +207,17 @@ Future fsProgressDownload( fileSink.add(chunk); // Calculate and print the download progress - double progress_rate = downloadedLength / contentLength!; - progressToken.add([downloadedLength, contentLength, progress_rate]); - debugPrint('Download progress: ${(progress_rate * 100).toStringAsFixed(2)}%'); + double progressRate = downloadedLength / contentLength!; + progressToken.add([downloadedLength, contentLength, progressRate]); + log('NodeBase [D] fsProgressDownload ... progress ${(progressRate * 100).toStringAsFixed(2)}%'); }, onDone: () async { // Close the fileSink to ensure all bytes are written await fileSink.close(); - debugPrint('Download completed: $filename'); + log('NodeBase [D] fsProgressDownload ... complete $filename'); }, onError: (e) { - debugPrint('Error: $e'); + log('NodeBase [E] fsProgressDownload ... $e'); }, cancelOnError: true, ); @@ -224,10 +228,10 @@ Future fsProgressDownload( httpClient.close(); }); } else { - debugPrint('Error: Server returned status code ${response.statusCode}'); + log('NodeBase [E] fsProgressDownload ... http ${response.statusCode}'); } } catch (e) { - debugPrint('Error: $e'); + log('NodeBase [E] fsProgressDownload ... $e'); } finally { progressToken.close(); cancelToken.close(); From e00b1943079ed2973cc2b4ad4bfcde513932f5c1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 29 Jan 2024 16:09:03 +0800 Subject: [PATCH 008/125] dart: init nodebase service - config: manage etc files - platform: manage files for executable binaries and applications according to os and arch - application: manage applications in runtime (processes) --- lib/ctrl/application.dart | 4 ++++ lib/ctrl/config.dart | 35 +++++++++++++++++++++++++++++ lib/ctrl/nodebase.dart | 23 ++++++++++++++++++++ lib/ctrl/platform.dart | 46 +++++++++++++++++++++++++++++++++++++++ lib/page/splash.dart | 3 ++- 5 files changed, 110 insertions(+), 1 deletion(-) create mode 100755 lib/ctrl/application.dart create mode 100755 lib/ctrl/config.dart create mode 100755 lib/ctrl/nodebase.dart create mode 100755 lib/ctrl/platform.dart diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart new file mode 100755 index 0000000..b071d46 --- /dev/null +++ b/lib/ctrl/application.dart @@ -0,0 +1,4 @@ +// manage application runtime + +class Application { +} \ No newline at end of file diff --git a/lib/ctrl/config.dart b/lib/ctrl/config.dart new file mode 100755 index 0000000..82caa33 --- /dev/null +++ b/lib/ctrl/config.dart @@ -0,0 +1,35 @@ +import "dart:convert"; +import "dart:io"; + +import "package:path/path.dart" as path; + +import "../util/fs.dart"; + +/* + /etc/nodebase/app { + "sources": [] + } + */ + +class Etc { + Future> readConfig(String name, String key) async { + Map r = {}; + try { + final text = await fsReadAppFileAsString(path.join("etc", name, key)); + r = jsonDecode(text); + } finally { } + return r; + } + + Future writeConfig(String name, String key, Map config) async { + final dir = path.join("etc", name); + final configName = path.join(dir, key); + final f = await fsGetAppFileReference(configName); + try { + await fsMkdir(dir); + final text = jsonEncode(config); + await fsWriteAppFileAsString(configName, text); + } finally { } + return f; + } +} \ No newline at end of file diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart new file mode 100755 index 0000000..517ec69 --- /dev/null +++ b/lib/ctrl/nodebase.dart @@ -0,0 +1,23 @@ +import '../ctrl/application.dart'; +import '../ctrl/config.dart'; +import '../ctrl/platform.dart'; +import '../util/api.dart'; +import '../util/event.dart' as event; + +class NodeBaseController { + late Application application; + late Platform platform; + late Etc config; + + Future initializeApp() async { + final parts = (await NodeBaseApi.apiUtilGetArch()).split("|")[0].split("-"); + String os = parts[0]; + String arch = parts[1]; + config = Etc(); + platform = Platform(os: os, arch: arch); + application = Application(); + event.initializeToken.add(true); + } +} + +final instance = NodeBaseController(); \ No newline at end of file diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart new file mode 100755 index 0000000..1d3dc75 --- /dev/null +++ b/lib/ctrl/platform.dart @@ -0,0 +1,46 @@ +// manage platform like executable files, application files + +/* + platform_service: + /nodebase.json { + "version": "version", + "platform--": "version" + } e.g. { + "version": "1.0.0", + "platform-android-arm": "20240101", + "platform-android-arm64": "20240101", + "platform-android-x86": "20240101", + "platform-window-x64": "20240101" + } + + /platform--.json { + "platforms": { + "": { + "": { + "url": "", + "sha256": "", + "description": "" + } + } + } + } e.g. { + } + + /application--.json { + "applications": { + "": { + "": { + "url": "", + "sha256": "", + "description": "" + } + } + } + } + */ + +class Platform { + Platform({required this.os, required this.arch}); + String os; + String arch; +} \ No newline at end of file diff --git a/lib/page/splash.dart b/lib/page/splash.dart index c972d61..302537c 100755 --- a/lib/page/splash.dart +++ b/lib/page/splash.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import '../util/event.dart' as event; +import '../ctrl/nodebase.dart' as nodebase; class SplashPage extends StatefulWidget { const SplashPage({super.key}); @@ -17,7 +18,7 @@ class _SplashPageState extends State { @override void initState() { super.initState(); - // TODO: trigger app init process in controller service + nodebase.instance.initializeApp(); initListener = event.initializeToken.stream.listen((event) { if (!initCompleter.isCompleted) { initCompleter.complete(); From b341ad646dd814f844353db247ab2d3790a96ea3 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 30 Jan 2024 10:08:22 +0800 Subject: [PATCH 009/125] dart: optimize _appPath process - cache the value at the first time --- lib/util/fs.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 82ceada..e6a02d4 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -9,8 +9,12 @@ import 'dart:developer'; // getApplicationDocumentsDirectory -> /data/data/app/... // getExternalStorageDirectory -> /storage/sdcard-external/android/data/app/... +var _appPath_ = ""; Future get _appPath async { - final directory = await getApplicationDocumentsDirectory(); + if (_appPath_ != "") return _appPath_; + var directory = await getApplicationDocumentsDirectory(); + _appPath_ = directory.path; + log("NodeBase [I] app path: $_appPath_"); return directory.path; } From d57d87e11f1f96c584904b57babd8210801b7e5c Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 30 Jan 2024 10:09:17 +0800 Subject: [PATCH 010/125] dart: add function to create dir for specified file --- lib/util/fs.dart | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index e6a02d4..ad82c13 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -166,6 +166,13 @@ Future fsUnzipFiles(String zipFilename, String dstDir) async { } } +Future fsGuaranteeDir(String filename) async { + final dir = Directory(path.dirname(filename)); + if (!dir.existsSync()) { + dir.create(recursive: true); + } +} + Future fsDownload(String filename, String url) async { var urlobj = Uri.parse(url); var client = HttpClient(); From 02018f36459ee8725ba4bf51488cc1eb17fd341a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 30 Jan 2024 10:45:27 +0800 Subject: [PATCH 011/125] dart, windows, android: add util.workspace to get workspace dir - windows: current exe folder - android: app data dir --- .../net/seven/nodebase/nodebase/MainActivity.java | 7 +++++++ lib/util/api.dart | 9 +++++++++ windows/runner/flutter_dart.h | 15 +++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java index e8f8935..cd7014c 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java @@ -93,6 +93,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result case "util.arch" -> { result.success(External.getArch()); } + case "util.workspace" -> { + result.success(workspaceBaseDir()); + } } } }); @@ -151,4 +154,8 @@ public boolean fileExecutablize(String fname) { File f = new File(fname); return f.setExecutable(true, true); } + + public String workspaceBaseDir() { + return getContext().getApplicationInfo().dataDir; + } } diff --git a/lib/util/api.dart b/lib/util/api.dart index ddfdb05..76155f1 100755 --- a/lib/util/api.dart +++ b/lib/util/api.dart @@ -44,6 +44,15 @@ class NodeBaseApi { } } + static Future apiUtilGetWorkspacePath() async { + try { + return await api.invokeMethod("util.workspace"); + } catch(e) { + log("NodeBase [E] utilGetWorkspacePath / ${e.toString()}"); + return ""; + } + } + static Future> apiAppStatus(String app) async { /* { state: "none" | "new" | "running" | "dead" diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h index 40e50ab..b82901d 100755 --- a/windows/runner/flutter_dart.h +++ b/windows/runner/flutter_dart.h @@ -341,6 +341,18 @@ flutter::EncodableValue utilGetArch() { } return flutter::EncodableValue(arch); } +flutter::EncodableValue utilWorkspaceBaseDir() { + TCHAR buf[1024]; + if (!GetModuleFileName(NULL, buf, 1024)) return flutter::EncodableValue(std::string("")); + buf[1023] = 0; + TCHAR* last = wcsrchr(buf, L'\\'); + if (last == nullptr || last == buf || last == &(buf[1]) || last == &(buf[2])) { + // not found, buf = "\\", buf = "\\\\", buf = "c:\\" + return flutter::EncodableValue(std::string("")); + } + last[0] = 0; + return flutter::EncodableValue(Utf8FromUtf16(buf)); +} #define RETURN_BADARG_ERR(x) { result->Error("BAD_ARGS", "Invalid argument type for '" #x "'"); return; } void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { @@ -421,6 +433,9 @@ void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { else if (call.method_name().compare("util.arch") == 0) { result->Success(utilGetArch()); } + else if (call.method_name().compare("util.workspace") == 0) { + result->Success(utilWorkspaceBaseDir()); + } else { result->NotImplemented(); } From 1fc22b8e078e05c60e5de8ecc153cb4f63f6de86 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 30 Jan 2024 10:46:55 +0800 Subject: [PATCH 012/125] dart: remove depedency of path_provider --- lib/util/fs.dart | 7 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 - pubspec.lock | 91 +------------------ pubspec.yaml | 2 +- 4 files changed, 5 insertions(+), 97 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index ad82c13..7b079eb 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:path_provider/path_provider.dart'; import 'package:archive/archive.dart'; +import 'package:nodebase/util/api.dart'; import 'package:path/path.dart' as path; import 'dart:io'; import 'dart:developer'; @@ -12,10 +12,9 @@ import 'dart:developer'; var _appPath_ = ""; Future get _appPath async { if (_appPath_ != "") return _appPath_; - var directory = await getApplicationDocumentsDirectory(); - _appPath_ = directory.path; + _appPath_ = await NodeBaseApi.apiUtilGetWorkspacePath(); log("NodeBase [I] app path: $_appPath_"); - return directory.path; + return _appPath_; } Future fsGetAppFileReference(filepath) async { diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index e777c67..cccf817 100755 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,6 @@ import FlutterMacOS import Foundation -import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/pubspec.lock b/pubspec.lock index 25f29d9..91dea57 100755 --- a/pubspec.lock +++ b/pubspec.lock @@ -58,7 +58,7 @@ packages: source: hosted version: "3.1.1" crypto: - dependency: transitive + dependency: "direct main" description: name: crypto sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab @@ -81,14 +81,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" - ffi: - dependency: transitive - description: - name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.0" flutter: dependency: "direct main" description: flutter @@ -168,70 +160,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.8.3" - path_provider: - dependency: "direct main" - description: - name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.2" - path_provider_android: - dependency: transitive - description: - name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.2.2" - path_provider_foundation: - dependency: transitive - description: - name: path_provider_foundation - sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.3.2" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.2.1" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.2" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.2.1" - platform: - dependency: transitive - description: - name: platform - sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.1.4" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.8" pointycastle: dependency: transitive description: @@ -317,22 +245,5 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.3.0" - win32: - dependency: transitive - description: - name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" - url: "https://pub.flutter-io.cn" - source: hosted - version: "5.2.0" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.4" sdks: dart: ">=3.2.4 <4.0.0" - flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 27b4d75..fd9b726 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,11 +36,11 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 path: ^1.8.3 - path_provider: ^2.1.2 archive: ^3.4.10 flutter_localizations: sdk: flutter intl: any + crypto: ^3.0.3 dev_dependencies: flutter_test: From 9aa889fc307e4104efd8fd8107ca8f76b84c5ff1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 30 Jan 2024 17:14:42 +0800 Subject: [PATCH 013/125] windows, android: update to post event message outside - when app start or stop, send out event message with the action and app name --- .../nodebase/nodebase/NodeAppMonitor.java | 29 +++++++++++++++++++ .../nodebase/NodeBaseEventHandler.java | 2 +- windows/runner/flutter_dart.h | 25 ++++++++++++++-- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java index 2a0da5d..7be9454 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java @@ -1,6 +1,8 @@ package net.seven.nodebase.nodebase; import android.os.Build; +import android.os.Handler; +import android.os.Looper; import java.io.IOException; import java.lang.reflect.Field; @@ -132,6 +134,12 @@ public NodeAppMonitor nodebaseRestart() { @Override public void run() { + Handler uiRunner; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + uiRunner = Handler.createAsync(Looper.getMainLooper()); + } else { + uiRunner = new Handler(Looper.getMainLooper()); + } try { this.nodebaseStat = STAT.READY; // TODO event/onReady @@ -159,6 +167,17 @@ public void run() { "started (%d / %s)", getId(), this.nodebaseName) ); + + uiRunner.post(new Runnable() { + @Override + public void run() { + ArrayList r = new ArrayList<>(); + r.add("start"); + r.add(nodebaseName); + NodeAppService.getEventHandler().postMessage("app", r); + } + }); + this.nodebaseProcess.waitFor(); } catch (IOException e) { Logger.e( @@ -192,6 +211,16 @@ public void run() { "stopped (%d / %s)", getId(), this.nodebaseName) ); + + uiRunner.post(new Runnable() { + @Override + public void run() { + ArrayList r = new ArrayList<>(); + r.add("stop"); + r.add(nodebaseName); + NodeAppService.getEventHandler().postMessage("app", r); + } + }); } } } diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java index 9bf4472..be91ae4 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java @@ -22,7 +22,7 @@ public synchronized void onCancel(Object name) { } } - public synchronized void postMessage(String name, String message) { + public synchronized void postMessage(String name, Object message) { EventChannel.EventSink ch = sink.get(name); if (ch == null) return; ch.success(message); diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h index b82901d..ec9d758 100755 --- a/windows/runner/flutter_dart.h +++ b/windows/runner/flutter_dart.h @@ -19,6 +19,7 @@ class NodeAppMonitor; class NodeBaseEventChannelHandler; +void utilEventPostMessage(std::string&& name, flutter::EncodableValue&& val); enum NodeAppSTAT { BORN, READY, RUNNING, DEAD @@ -75,10 +76,25 @@ class NodeAppMonitor { return; } this->stat = NodeAppSTAT::RUNNING; + + { + flutter::EncodableList r; + r.push_back(flutter::EncodableValue("start")); + r.push_back(flutter::EncodableValue(name)); + utilEventPostMessage("app", flutter::EncodableValue(r)); + } + WaitForSingleObject( this->pi.hProcess, INFINITE ); this->stat = NodeAppSTAT::DEAD; CloseHandle( this->pi.hProcess ); CloseHandle( this->pi.hThread ); + + { + flutter::EncodableList r; + r.push_back(flutter::EncodableValue("stop")); + r.push_back(flutter::EncodableValue(name)); + utilEventPostMessage("app", flutter::EncodableValue(r)); + } } void Stop() { @@ -239,12 +255,12 @@ class NodeBaseEventChannelHandler { event_channel->SetStreamHandler(std::move(event_channel_handler)); } - void postMessage(std::string&& name, std::string&& message) { + void postMessage(std::string&& name, flutter::EncodableValue message) { auto target_ = this->sink.find(name); if (target_ == this->sink.end()) return; if (!target_->second) return; //auto target = target_->second; - target_->second->Success(flutter::EncodableValue(message)); + target_->second->Success(message); } private: std::string EncodableValue2String(const flutter::EncodableValue* val) { @@ -266,6 +282,11 @@ static std::map services; static std::mutex service_lock; static std::unique_ptr eventHandler; +void utilEventPostMessage(std::string&& name, flutter::EncodableValue&& val) { + if (eventHandler == nullptr) return; + eventHandler->postMessage(std::move(name), val); +} + void appStart(const std::string &name, const std::string &cmd) { std::lock_guard guard(service_lock); auto app_ = services.find(name); From b8a5bc3aaf0bb8752b2c50096ec9ddd81c6fa9c8 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 12:14:44 +0800 Subject: [PATCH 014/125] dart, windows, android: alter app start api, adding env - pass name, cmd(list), env(map) to native - windows: handle cmd and env with CreateProcess - android: handle cmd and env with ProcessBuilder --- .../seven/nodebase/nodebase/MainActivity.java | 13 +- .../nodebase/nodebase/NodeAppMonitor.java | 14 ++- .../nodebase/nodebase/NodeAppService.java | 4 +- lib/util/api.dart | 8 +- windows/runner/flutter_dart.h | 118 +++++++++++++----- 5 files changed, 111 insertions(+), 46 deletions(-) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java index cd7014c..8b418fc 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java @@ -32,12 +32,13 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result switch(call.method) { case "app.start" -> { String name = call.argument("name"); - String cmd = call.argument("cmd"); - if (name == null || cmd == "" || cmd.length() == 0) { + ArrayList cmd = call.argument("cmd"); + HashMap env = call.argument("env"); + if (name == null || cmd == null || cmd.size() == 0) { result.error("app.start", "empty name or cmd", null); return; } - if (startNodeApp(name, cmd) == ChannelResult.OK) { + if (startNodeApp(name, cmd, env) == ChannelResult.OK) { result.success(true); } else { result.error("app.start", "internal error", null); @@ -106,14 +107,16 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result ).setStreamHandler(NodeAppService.getEventHandler()); } - public ChannelResult startNodeApp(String name, String cmd) { + public ChannelResult startNodeApp(String name, ArrayList cmd, HashMap env) { Logger.i( "NodeBase", "startNodeApp", String.format("start node app (%s) -> %s", name, cmd)); Intent it = new Intent(getContext(), ForegroundNodeService.class); ContextCompat.startForegroundService(getContext(), it); - NodeAppService.startNodeApp(name, cmd.split("\u0001")); + String[] cmd_ = new String[cmd.size()]; + cmd.toArray(cmd_); + NodeAppService.startNodeApp(name, cmd_, env); return ChannelResult.OK; } diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java index 7be9454..585e71e 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.HashMap; import java.util.Locale; public class NodeAppMonitor extends Thread { @@ -22,11 +23,14 @@ private enum STAT { private Process nodebaseProcess; private final String nodebaseName; private final String[] nodebaseCmd; + private final HashMap nodebaseEnv; - public NodeAppMonitor(String name, String[] cmd) { + public NodeAppMonitor(String name, String[] cmd, HashMap env) { super(); this.nodebaseName = name; this.nodebaseCmd = cmd; + this.nodebaseEnv = new HashMap<>(); + if (env != null) this.nodebaseEnv.putAll(env); this.nodebaseStat = STAT.BORN; this.nodebaseProcess = null; } @@ -127,7 +131,7 @@ public boolean nodebaseStop() { public NodeAppMonitor nodebaseRestart() { this.nodebaseStop(); - NodeAppMonitor m = new NodeAppMonitor(this.nodebaseName, this.nodebaseCmd); + NodeAppMonitor m = new NodeAppMonitor(this.nodebaseName, this.nodebaseCmd, this.nodebaseEnv); m.start(); return m; } @@ -157,7 +161,11 @@ public void run() { // when stop the service, it guarantees that no race condition for // setting nodebaseStat this.nodebaseStat = STAT.RUNNING; - this.nodebaseProcess = Runtime.getRuntime().exec(this.nodebaseCmd); + ProcessBuilder build = new ProcessBuilder(this.nodebaseCmd); + // XXX: do we need to check some important variable should not be changed + // e.g. HOME, USER, PWD, ... + build.environment().putAll(this.nodebaseEnv); + this.nodebaseProcess = build.start(); // TODO event/onStart Logger.i( "NodeBase", diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java index 108d8e5..0deffca 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java @@ -18,7 +18,7 @@ public static int getRunningNodeAppCount() { return count; } - public static void startNodeApp(String name, String[] cmd) { + public static void startNodeApp(String name, String[] cmd, HashMap env) { synchronized (services) { NodeAppMonitor app; if (services.containsKey(name)) { @@ -26,7 +26,7 @@ public static void startNodeApp(String name, String[] cmd) { if (app != null && !app.nodebaseIsDead()) return; // only process if the service is null/dead } - app = new NodeAppMonitor(name, cmd); + app = new NodeAppMonitor(name, cmd, env); app.nodebaseStart(); services.put(name, app); } diff --git a/lib/util/api.dart b/lib/util/api.dart index 76155f1..8f2aaae 100755 --- a/lib/util/api.dart +++ b/lib/util/api.dart @@ -70,10 +70,14 @@ class NodeBaseApi { } } - static Future apiAppStart(String app, List cmd) async { + static Future apiAppStart( + String app, + List cmd, + { Map env = const {} } + ) async { try { await api.invokeMethod( - 'app.start', {"name": app, "cmd": cmd.join("\x01")} + 'app.start', {"name": app, "cmd": cmd, "env": env} ); } catch (e) { log("NodeBase [E] appStart / ${e.toString()}"); diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h index ec9d758..959f06a 100755 --- a/windows/runner/flutter_dart.h +++ b/windows/runner/flutter_dart.h @@ -13,8 +13,6 @@ #include #include #include -#include -#include #include "utils.h" class NodeAppMonitor; @@ -27,9 +25,10 @@ enum NodeAppSTAT { class NodeAppMonitor { public: - NodeAppMonitor(const std::string &name, const std::string &cmd) { + NodeAppMonitor(const std::string &name, const std::vector &cmd, const std::map &env) { this->name = name; this->cmd = cmd; + this->env = env; this->stat = NodeAppSTAT::BORN; ZeroMemory(&this->pi, sizeof(this->pi)); this->pth = std::thread(NodeAppMonitor::Run, this); @@ -42,18 +41,12 @@ class NodeAppMonitor { void Start() { this->stat = NodeAppSTAT::READY; STARTUPINFO si; - ZeroMemory(&si, sizeof(si)); + SecureZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - ZeroMemory(&this->pi, sizeof(this->pi)); - std::vector cmdL; - this->SplitCmd(cmdL, this->cmd); - std::wstring prog = Utf8ToUtf16(cmdL.at(0).c_str()); - cmdL.erase(cmdL.begin()); - std::wstring cmdLine = Utf8ToUtf16( - std::accumulate( - cmdL.begin(), cmdL.end(), std::string(" ") - ).c_str() - ); + SecureZeroMemory(&this->pi, sizeof(this->pi)); + std::wstring prog = Utf8ToUtf16((*(this->cmd.begin())).c_str()); + std::wstring cmdLine = this->BuildCommandLine(); + std::wstring envStr = this->BuildEnvironment(); // ref: https://forums.codeguru.com/showthread.php?514716-std-string-to-LPSTR LPWSTR cmdLineAdapter = &cmdLine.front(); if (!CreateProcess( @@ -61,9 +54,9 @@ class NodeAppMonitor { cmdLineAdapter, nullptr, nullptr, - FALSE, - 0, - nullptr, + TRUE, + CREATE_UNICODE_ENVIRONMENT, + this->env.size() == 0 ? nullptr : (LPVOID)(envStr.c_str()), nullptr, &si, &pi) @@ -118,7 +111,7 @@ class NodeAppMonitor { NodeAppMonitor* restart() { this->Stop(); - return new NodeAppMonitor(this->name, this->cmd); + return new NodeAppMonitor(this->name, this->cmd, this->env); } flutter::EncodableValue toJSON() { std::string rstat = "none"; @@ -146,28 +139,54 @@ class NodeAppMonitor { bool IsDead() { return this->stat == NodeAppSTAT::DEAD; } std::string GetName() { return this->name; } - std::string GetCmd() { return this->cmd; } + std::vector GetCmd() { return this->cmd; } + std::map GetEnv() { return this->env; } private: - int SplitCmd(std::vector &vec, const std::string &cmdx0) { + static void Run(NodeAppMonitor* app) { + app->Start(); + } + + std::wstring BuildCommandLine() { + std::wostringstream os; + // process command line to deal with space and special characters + // e.g. convert 'a "\b c' into '"a ""\\b c"' + for (auto i = this->cmd.begin(); i != this->cmd.end(); i++) { + std::wstring one = Utf8ToUtf16(i->c_str()); + this->replaceAllW(one, L"\\", L"\\\\"); + this->replaceAllW(one, L"\"", L"\"\""); + os << L'"' << one << L'"' << L' '; + } + return os.str(); + } + + std::wstring BuildEnvironment() { + std::wostringstream os; + // TODO+XXX: process env to deal with space and special characters + for (auto i = this->env.begin(); i != this->env.end(); i++) { + os << Utf8ToUtf16(i->first.c_str()) << L'='; + os << Utf8ToUtf16(i->second.c_str()) << L'\x00'; + } + os << L'\x00'; + return os.str(); + } + + // ref: https://stackoverflow.com/questions/2896600/how-to-replace-all-occurrences-of-a-character-in-string + int replaceAllW(std::wstring& str, const std::wstring& from, const std::wstring& to) { int count = 0; - std::stringstream spliter(cmdx0); - std::string item; - vec.clear(); - while (std::getline(spliter, item, '\x01')) { - vec.push_back(item); + size_t start_pos = 0; + while((start_pos = str.find(from, start_pos)) != std::wstring::npos) { + str.replace(start_pos, from.length(), to); + start_pos += to.length(); count++; } return count; } - static void Run(NodeAppMonitor* app) { - app->Start(); - } - private: NodeAppSTAT stat; std::string name; - std::string cmd; + std::vector cmd; + std::map env; std::thread pth; PROCESS_INFORMATION pi; }; @@ -284,10 +303,24 @@ static std::unique_ptr eventHandler; void utilEventPostMessage(std::string&& name, flutter::EncodableValue&& val) { if (eventHandler == nullptr) return; + /* + * XXX: annoying warning but no non-hacking solution yet, + * need help from `fml` namespace + * general idea: + * - when init channels, get current thread id + * - using the thread id to get task runner + * - do post task here + * [eventHandler=eventHandler.get(),name=std::move(name),val]() {...}; + * + * The 'net.seven.nodebase/event' channel sent a message from native to Flutter on + * a non-platform thread. Platform channel messages must be sent on the platform + * thread. Failure to do so may result in data loss or crashes, and must be fixed + * in the plugin or application code creating that channel. + */ eventHandler->postMessage(std::move(name), val); } -void appStart(const std::string &name, const std::string &cmd) { +void appStart(const std::string &name, const std::vector &cmd, const std::map &env) { std::lock_guard guard(service_lock); auto app_ = services.find(name); NodeAppMonitor *app; @@ -296,7 +329,7 @@ void appStart(const std::string &name, const std::string &cmd) { services.erase(name); delete app; } - app = new NodeAppMonitor(name, cmd); + app = new NodeAppMonitor(name, cmd, env); // TODO: if (!app) {} // memory allocate failure services.insert_or_assign(name, app); } @@ -403,9 +436,26 @@ void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { if (name_ == args->end()) RETURN_BADARG_ERR(app.start); auto cmd_ = args->find(flutter::EncodableValue("cmd")); if (cmd_ == args->end()) RETURN_BADARG_ERR(app.start); + auto env_ = args->find(flutter::EncodableValue("env")); + if (env_ == args->end()) RETURN_BADARG_ERR(app.start); std::string name = std::get(name_->second); - std::string cmd = std::get(cmd_->second); - appStart(name, cmd); + + flutter::EncodableList cmdRaw = std::get(cmd_->second); + std::vector cmd; + cmd.reserve(cmdRaw.size()); + for (const auto &val : cmdRaw) { + cmd.push_back(std::get(val)); + } + + flutter::EncodableMap envRaw = std::get(env_->second); + std::map env; + for (const auto &val : envRaw) { + env.insert_or_assign( + std::get(val.first), + std::get(val.second) + ); + } + appStart(name, cmd, env); result->Success(); } else if (call.method_name().compare("app.restart") == 0) { From ec613ba308120d3c23c897e7f243f22f7e917f4f Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 13:30:32 +0800 Subject: [PATCH 015/125] dart: add fsGetBaseDir and fsCalcHash in fs.dart --- lib/util/fs.dart | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 7b079eb..c7b3056 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -1,10 +1,12 @@ import 'dart:async'; +import 'dart:io'; +import 'dart:developer'; import 'package:archive/archive.dart'; -import 'package:nodebase/util/api.dart'; +import 'package:crypto/crypto.dart'; import 'package:path/path.dart' as path; -import 'dart:io'; -import 'dart:developer'; + +import './api.dart'; // getApplicationDocumentsDirectory -> /data/data/app/... // getExternalStorageDirectory -> /storage/sdcard-external/android/data/app/... @@ -17,6 +19,10 @@ Future get _appPath async { return _appPath_; } +Future fsGetBaseDir() async { + return await _appPath; +} + Future fsGetAppFileReference(filepath) async { final base = await _appPath; return File(path.join(base, filepath)); @@ -249,3 +255,9 @@ Future fsProgressDownload( } } +Future fsCalcHash(String filename) async { + final f = File(filename); + if (!f.existsSync()) return ""; + final digest = await sha256.bind(f.openRead()).first; + return digest.toString(); +} From f6434b811c5ff7a4b30743bc04233d1c8f9f7c5a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 21:16:41 +0800 Subject: [PATCH 016/125] windows: nullptr cause nodebase crash - EncodableValue2String get val, which is a pointer - it can be nullptr --- windows/runner/flutter_dart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h index 959f06a..145282d 100755 --- a/windows/runner/flutter_dart.h +++ b/windows/runner/flutter_dart.h @@ -283,7 +283,7 @@ class NodeBaseEventChannelHandler { } private: std::string EncodableValue2String(const flutter::EncodableValue* val) { - if (val->IsNull()) { + if (!val || val->IsNull()) { return std::string(""); } From 2975ce22b9462d27dfed138f9d190bf044ed7467 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 21:22:09 +0800 Subject: [PATCH 017/125] dart: init ctrl of application runtime - manage a named application runtime - start, stop applications - get all running applications - monitor application runtime state --- lib/ctrl/application.dart | 85 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart index b071d46..48554b5 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application.dart @@ -1,4 +1,89 @@ // manage application runtime +import 'dart:async'; + +import '../util/api.dart'; + +class ApplicationProcess { + ApplicationProcess({ + required this.name, + required this.cmd, + }); + + String name; + List cmd; + Map env = {}; + String state = "new"; + + void start() { + NodeBaseApi.apiAppStart(name, cmd, env: env); + } + + void stop() { + NodeBaseApi.apiAppStop(name); + } + + Future syncState() async { + final obj = await NodeBaseApi.apiAppStatus(name); + final r = obj["state"]; + state = r; + return r; + } + + bool isDead() => state == "dead"; +} + class Application { + static final Finalizer _finalizer = + Finalizer((Application instance) { + instance.listener.cancel(); + instance.runtime.forEach((_, app) => app.stop()); + }); + + late StreamSubscription listener; + + Application({ + required this.baseDir + }) { + _connect(); + } + + void _connect() { + listener = NodeBaseApi.event.receiveBroadcastStream("app").listen((message) { + if (message is List) { + final name = message[0]; + final state = message[1]; + final app = runtime[name]; + if (app != null) { + app.state = state; + if (state == "dead") runtime.remove(name); + } + } + }); + _finalizer.attach(this, this, detach: this); + } + + void startProcess(String name, List cmd, Map env) { + final app = ApplicationProcess(name: name, cmd: cmd); + app.env = env; + app.start(); + } + + void stopProcess(String name) { + final app = runtime[name]; + if (app == null) return; + app.stop(); + } + + ApplicationProcess? getApp(String name) => runtime[name]; + List getRunningApp() { + final List r = []; + runtime.forEach((name, app) { + if (!app.isDead()) r.add(app); + }); + return r; + } + + String baseDir; + Map runtime = {}; } \ No newline at end of file From 490afeb7de471eba61f2269b7d5fed24b8347abb Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 21:26:39 +0800 Subject: [PATCH 018/125] dart: bugfix - ctrl application - no use of Finalizer - who uses Application should call dispose exiplitly - as a service, usually no need dispose; but in case --- lib/ctrl/application.dart | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart index 48554b5..5316d3f 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application.dart @@ -34,12 +34,6 @@ class ApplicationProcess { } class Application { - static final Finalizer _finalizer = - Finalizer((Application instance) { - instance.listener.cancel(); - instance.runtime.forEach((_, app) => app.stop()); - }); - late StreamSubscription listener; Application({ @@ -60,7 +54,6 @@ class Application { } } }); - _finalizer.attach(this, this, detach: this); } void startProcess(String name, List cmd, Map env) { @@ -84,6 +77,11 @@ class Application { return r; } + void dispose() { + listener.cancel(); + runtime.forEach((_, app) => app.stop()); + } + String baseDir; Map runtime = {}; } \ No newline at end of file From 8554556c362c5b6c73beb3ee67ae1c3e375db102 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 31 Jan 2024 21:39:26 +0800 Subject: [PATCH 019/125] dart: minor - fs.dart - correctly process 0 byte when download --- lib/util/fs.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index c7b3056..5de3aba 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -223,7 +223,7 @@ Future fsProgressDownload( fileSink.add(chunk); // Calculate and print the download progress - double progressRate = downloadedLength / contentLength!; + double progressRate = contentLength == 0 ? 1 : (downloadedLength / contentLength); progressToken.add([downloadedLength, contentLength, progressRate]); log('NodeBase [D] fsProgressDownload ... progress ${(progressRate * 100).toStringAsFixed(2)}%'); }, From 0fff43bfdaa8e66418d59c83180124d480fcb071 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 1 Feb 2024 12:29:16 +0800 Subject: [PATCH 020/125] dart: add comment for sandbox on app security --- lib/ctrl/application.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart index 5316d3f..e18bad7 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application.dart @@ -59,6 +59,9 @@ class Application { void startProcess(String name, List cmd, Map env) { final app = ApplicationProcess(name: name, cmd: cmd); app.env = env; + // XXX: if we want sandbox to run applications, + // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl + // on Linux, Android, consider proot app.start(); } From ce01d5d18492c9875372e27071bde3ef68c7a4c0 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 1 Feb 2024 13:27:44 +0800 Subject: [PATCH 021/125] dart: remove config.dart in ctrl, no need any more --- lib/ctrl/config.dart | 35 ----------------------------------- lib/ctrl/nodebase.dart | 15 ++++++++++----- lib/util/fs.dart | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 40 deletions(-) delete mode 100755 lib/ctrl/config.dart diff --git a/lib/ctrl/config.dart b/lib/ctrl/config.dart deleted file mode 100755 index 82caa33..0000000 --- a/lib/ctrl/config.dart +++ /dev/null @@ -1,35 +0,0 @@ -import "dart:convert"; -import "dart:io"; - -import "package:path/path.dart" as path; - -import "../util/fs.dart"; - -/* - /etc/nodebase/app { - "sources": [] - } - */ - -class Etc { - Future> readConfig(String name, String key) async { - Map r = {}; - try { - final text = await fsReadAppFileAsString(path.join("etc", name, key)); - r = jsonDecode(text); - } finally { } - return r; - } - - Future writeConfig(String name, String key, Map config) async { - final dir = path.join("etc", name); - final configName = path.join(dir, key); - final f = await fsGetAppFileReference(configName); - try { - await fsMkdir(dir); - final text = jsonEncode(config); - await fsWriteAppFileAsString(configName, text); - } finally { } - return f; - } -} \ No newline at end of file diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 517ec69..5805217 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -1,21 +1,26 @@ import '../ctrl/application.dart'; -import '../ctrl/config.dart'; import '../ctrl/platform.dart'; +import '../util/fs.dart'; import '../util/api.dart'; import '../util/event.dart' as event; +const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; + class NodeBaseController { late Application application; late Platform platform; - late Etc config; Future initializeApp() async { final parts = (await NodeBaseApi.apiUtilGetArch()).split("|")[0].split("-"); String os = parts[0]; String arch = parts[1]; - config = Etc(); - platform = Platform(os: os, arch: arch); - application = Application(); + final appBaseDir = await fsGetBaseDir(); + var baseUrl = defaultPlatformBaseUrl; + // TODO: read app config and get default base url + platform = Platform(baseUrl: baseUrl, baseDir: appBaseDir, os: os, arch: arch); + application = Application(baseDir: appBaseDir); + // TODO: read user settings, app list, platform list + // get latest app, platform list from remote event.initializeToken.add(true); } } diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 5de3aba..274e8fd 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:convert'; import 'dart:io'; import 'dart:developer'; @@ -44,6 +45,29 @@ Future fsWriteAppFileAsString(filepath, contents) async { file.writeAsString(contents); } +Future> fsReadFileAsJson(String filepath) async { + Map r = {}; + try { + final text = await fsReadAppFileAsString(filepath); + r = jsonDecode(text); + } catch(e) { + log("NodeBase [E] fsReadFileAsString ... $e"); + } + return r; +} + +Future fsWriteFileAsJson(String filepath, Map config) async { + final f = await fsGetAppFileReference(filepath); + try { + await fsGuaranteeDir(f.path); + final text = jsonEncode(config); + await fsWriteAppFileAsString(filepath, text); + } catch(e) { + log("NodeBase [E] fsWriteFileAsString ... $e"); + } + return f; +} + Future fsGetEntity(filepath) async { final base = await _appPath; final filename = path.join(base, filepath); From 9a52cbc30cfff1672ff7093fe6d53fa3fb93223a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 1 Feb 2024 22:56:26 +0800 Subject: [PATCH 022/125] dart: optimize fs.dart - add calc string hash - use absolute path for file read/write instead of relative - when downloading, report start, cancel/error besides progress --- lib/util/fs.dart | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 274e8fd..0a6c67e 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -24,14 +24,11 @@ Future fsGetBaseDir() async { return await _appPath; } -Future fsGetAppFileReference(filepath) async { - final base = await _appPath; - return File(path.join(base, filepath)); -} - -Future fsReadAppFileAsString(filepath) async { +Future fsReadFileAsString(filepath) async { try { - final file = await fsGetAppFileReference(filepath); + final baseDir = await _appPath; + if (!filepath.startsWith(baseDir)) return ""; + final file = File(filepath); String contents = await file.readAsString(); return contents; } catch (e) { @@ -40,15 +37,19 @@ Future fsReadAppFileAsString(filepath) async { } } -Future fsWriteAppFileAsString(filepath, contents) async { - final file = await fsGetAppFileReference(filepath); +Future fsWriteFileAsString(filepath, contents) async { + final baseDir = await _appPath; + if (!filepath.startsWith(baseDir)) return; + final file = File(filepath); file.writeAsString(contents); } Future> fsReadFileAsJson(String filepath) async { Map r = {}; try { - final text = await fsReadAppFileAsString(filepath); + final baseDir = await _appPath; + if (!filepath.startsWith(baseDir)) return r; + final text = await fsReadFileAsString(filepath); r = jsonDecode(text); } catch(e) { log("NodeBase [E] fsReadFileAsString ... $e"); @@ -57,11 +58,11 @@ Future> fsReadFileAsJson(String filepath) async { } Future fsWriteFileAsJson(String filepath, Map config) async { - final f = await fsGetAppFileReference(filepath); + final f = File(filepath); try { await fsGuaranteeDir(f.path); final text = jsonEncode(config); - await fsWriteAppFileAsString(filepath, text); + await fsWriteFileAsString(filepath, text); } catch(e) { log("NodeBase [E] fsWriteFileAsString ... $e"); } @@ -254,15 +255,18 @@ Future fsProgressDownload( onDone: () async { // Close the fileSink to ensure all bytes are written await fileSink.close(); + progressToken.add([-1, contentLength, 1]); log('NodeBase [D] fsProgressDownload ... complete $filename'); }, onError: (e) { + progressToken.add([-1, contentLength, -1]); log('NodeBase [E] fsProgressDownload ... $e'); }, cancelOnError: true, ); cancelToken.stream.listen((_) { + progressToken.add([-1, contentLength, -1]); subscription.cancel(); fileSink.close(); httpClient.close(); @@ -285,3 +289,8 @@ Future fsCalcHash(String filename) async { final digest = await sha256.bind(f.openRead()).first; return digest.toString(); } + +Future fsCalcStringHash(String text) async { + final digest = sha256.convert(utf8.encode(text)); + return digest.toString(); +} \ No newline at end of file From d2e3a8b18714158a7ad91e91a2a3aa0a87e4eddc Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 1 Feb 2024 22:58:56 +0800 Subject: [PATCH 023/125] dart: add platform stream controller - add a sink to get events from platform.dart instance --- lib/util/event.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util/event.dart b/lib/util/event.dart index b61f58e..25c43ff 100755 --- a/lib/util/event.dart +++ b/lib/util/event.dart @@ -1,3 +1,4 @@ import 'dart:async'; -final initializeToken = StreamController(); \ No newline at end of file +final initializeToken = StreamController(); +final platformToken = StreamController(); \ No newline at end of file From 5948d08102ecf9c4bb8928a87b8c4fa4073355d1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 2 Feb 2024 17:43:10 +0800 Subject: [PATCH 024/125] dart: add control for platform - file/config ops - app, bin file download - app, bin config read/write - app, bin remove - app, bin list --- lib/ctrl/platform.dart | 403 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 366 insertions(+), 37 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 1d3dc75..a1c6407 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -1,46 +1,375 @@ // manage platform like executable files, application files +import 'dart:async'; +import 'dart:io'; +import 'package:nodebase/util/api.dart'; +import 'package:path/path.dart' as path; + +import '../util/fs.dart'; +import '../util/event.dart' as event; + /* - platform_service: - /nodebase.json { - "version": "version", - "platform--": "version" - } e.g. { - "version": "1.0.0", - "platform-android-arm": "20240101", - "platform-android-arm64": "20240101", - "platform-android-x86": "20240101", - "platform-window-x64": "20240101" - } - - /platform--.json { - "platforms": { - "": { - "": { - "url": "", - "sha256": "", - "description": "" - } - } - } - } e.g. { - } - - /application--.json { - "applications": { - "": { - "": { - "url": "", - "sha256": "", - "description": "" - } - } - } - } + * == remote == + * /nodebase.json -> /workspace/tmp/nodebase.json + * - version + * - platform-- + * e.g. + * - version: 1.0 + * - platform-android-arm64: 20240101 + * + * /app--.json -> /workspace/tmp/app--.json + * - name + * - version + * /plm--.json -> /workspace/tmp/plm--.json + * - name + * - version + * /app///(-).json + * - url + * - sha256 + * - description + * - timestamp + * - entry + * /plm///(-).json + * - url + * - sha256 + * - description + * - timestamp + * - entry + * + * == local == + * /workspace/etc/nodebase/app.json + * - version + * - sources + * /workspace/etc/nodebase/sources/plm/().list + * /workspace/etc/nodebase/plm/all.list + * - name + * - version + * - source + * - meta_json + * /workspace/etc/nodebase/plm/(-).json + * - name + * - version + * - manifest (files, directories) + * - filename + * - type=exe,none + * /workspace/etc/nodebase/sources/app/().list + * /workspace/etc/nodebase/app/all.list + * - name + * - version + * - source + * - meta_json + * /workspace/etc/nodebase/app/(-).json + * - name + * - version + * - requirements + * - platform + * /workspace/etc/plm/(-)/... + * - name + * - version + * - executable + * - filename + * - type=exe,none + * /workspace/etc/app/(-)/... + * /workspace/app/... + * /workspace/plm/... */ class Platform { - Platform({required this.os, required this.arch}); + Platform({ + required this.baseUrl, + required this.baseDir, + required this.os, + required this.arch}); + String baseUrl; + String baseDir; String os; String arch; + + Map downloadQueue = {}; + + String _getEtcBaseDir() => path.join(baseDir, "workspace", "etc"); + String _getTmpBaseDir() => path.join(baseDir, "workspace", "tmp"); + String _getApplicationBaseDir() => path.join(baseDir, "workspace", "app"); + String _getPlatformBaseDir() => path.join(baseDir, "workspace", "plm"); + + void changeBaseUrl(String url) { baseUrl = url; } + + Future> readNodeBaseJson() async => + fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "nodebase.json")); + Future> readApplicationListJson() async => + fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json")); + Future> readPlatformListJson() async => + fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json")); + Future> readApplicationMetaJson(String name, String version) async => + fsReadFileAsJson(path.join(_getEtcBaseDir(), "app", await fsCalcStringHash("$name-$version"), "meta.json")); + Future> readPlatformMetaJson(String name, String version) async => + fsReadFileAsJson(path.join(_getEtcBaseDir(), "plm", await fsCalcStringHash("$name-$version"), "meta.json")); + + Future _downloadFile( + String name, + String url, + String targetFilename, + StreamController? cancel) async { + final signal = StreamController(); + final done = Completer(); + cancel ??= StreamController(); + event.platformToken.add([name, targetFilename, 0]); + final download = fsProgressDownload(targetFilename, url, signal, cancel); + signal.stream.listen((message) { + final progress = message[2]; + if (progress == -1) { + // cancel or error + event.platformToken.add([name, targetFilename, -1]); + } else { + event.platformToken.add([name, targetFilename, progress]); + } + }); + download.onError((error, stackTrace) => done.completeError(error!, stackTrace)); + download.then((_) => done.complete()); + return done.future; + } + Future downloadNodeBaseJson({StreamController? cancel}) async { + final tmpFilename = path.join(_getTmpBaseDir(), "nodebase.json"); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("nodebase.json", "$baseUrl/nodebase.json", tmpFilename, cancel); + final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); + await fsGuaranteeDir(targetFilename); + final tmpFile = File(tmpFilename); + await tmpFile.copy(targetFilename); + await tmpFile.delete(); + action.complete(); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadApplicationListJson({StreamController? cancel}) async { + final tmpFilename = path.join(_getTmpBaseDir(), "app-$os-$arch.json"); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("app-$os-$arch.json", "$baseUrl/app-$os-$arch.json", tmpFilename, cancel); + final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); + await fsGuaranteeDir(targetFilename); + final tmpFile = File(tmpFilename); + await tmpFile.copy(targetFilename); + await tmpFile.delete(); + action.complete(); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadPlatformListJson({StreamController? cancel}) async { + final tmpFilename = path.join(_getTmpBaseDir(), "plm-$os-$arch.json"); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("plm-$os-$arch.json", "$baseUrl/plm-$os-$arch.json", tmpFilename, cancel); + final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); + await fsGuaranteeDir(targetFilename); + final tmpFile = File(tmpFilename); + await tmpFile.copy(targetFilename); + await tmpFile.delete(); + action.complete(); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}) async { + final hash = await fsCalcStringHash("$name-$version"); + final tmpFilename = path.join(_getTmpBaseDir(), "app-$hash-meta.json"); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("app-$name-$version.json", "$baseUrl/app/$os/$arch/$hash.json", tmpFilename, cancel); + final targetFilename = path.join(_getEtcBaseDir(), "app", "$hash.json"); + await fsGuaranteeDir(targetFilename); + final tmpFile = File(tmpFilename); + await tmpFile.copy(targetFilename); + await tmpFile.delete(); + action.complete(); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}) async { + final hash = await fsCalcStringHash("$name-$version"); + final tmpFilename = path.join(_getTmpBaseDir(), "plm-$hash-meta.json"); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("plm-$name-$version.json", "$baseUrl/plm/$os/$arch/$hash.json", tmpFilename, cancel); + final targetFilename = path.join(_getEtcBaseDir(), "app", "$hash.json"); + await fsGuaranteeDir(targetFilename); + final tmpFile = File(tmpFilename); + await tmpFile.copy(targetFilename); + await tmpFile.delete(); + action.complete(); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadApplicationBinary(String name, String version, String url, {StreamController? cancel}) async { + final hash = await fsCalcStringHash("$name-$version"); + final baseName = path.basename(url); + final tmpFilename = path.join(_getTmpBaseDir(), baseName); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("app-$name-$version.bin", url, tmpFilename, cancel); + final tmpFile = File(tmpFilename); + if (baseName.endsWith(".zip")) { + final targetFilename = path.join(_getApplicationBaseDir(), hash); + await fsMkdir(targetFilename); + await fsUnzipFiles(tmpFilename, targetFilename); + } else { + final targetFilename = path.join(_getApplicationBaseDir(), hash, baseName); + await fsGuaranteeDir(targetFilename); + await tmpFile.copy(targetFilename); + } + await tmpFile.delete(); + await _configListAdd("app-list.json", name, version); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}) async { + final hash = await fsCalcStringHash("$name-$version"); + final baseName = path.basename(url); + final tmpFilename = path.join(_getTmpBaseDir(), baseName); + final doing = downloadQueue[tmpFilename]; + if (doing != null) return await doing; + final action = Completer(); + downloadQueue[tmpFilename] = action.future; + try { + await _downloadFile("plm-$name-$version.bin", url, tmpFilename, cancel); + final tmpFile = File(tmpFilename); + if (baseName.endsWith(".zip")) { + final targetFilename = path.join(_getPlatformBaseDir(), hash); + await fsMkdir(targetFilename); + await fsUnzipFiles(tmpFilename, targetFilename); + for (final fname in await listPlatformExecutableList(name, version)) { + await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); + } + } else { + final targetFilename = path.join(_getPlatformBaseDir(), hash, baseName); + await fsGuaranteeDir(targetFilename); + await tmpFile.copy(targetFilename); + await NodeBaseApi.apiUtilMarkExecutable(targetFilename); + } + await tmpFile.delete(); + await _configListRemove("plm-list.json", name, version); + } catch (e) { + action.completeError(e); + } finally { + downloadQueue.remove(tmpFilename); + } + } + + Future _configListAdd(String target, String name, String version) async { + final filename = path.join(_getEtcBaseDir(), "nodebase", target); + final config = await fsReadFileAsJson(filename); + List list = config["items"] ?? []; + final addone = "$name-$version"; + if (!list.contains(addone)) list.add(addone); + config["items"] = list; + await fsWriteFileAsJson(filename, config); + } + Future _configListRemove(String target, String name, String version) async { + final filename = path.join(_getEtcBaseDir(), "nodebase", target); + final config = await fsReadFileAsJson(filename); + List list = config["items"] ?? []; + final addone = "$name-$version"; + int i = list.indexOf(addone); + if (i >= 0) { + list.removeAt(i); + } + config["items"] = list; + await fsWriteFileAsJson(filename, config); + } + + Future> listAvailableApplicationList() async { + final filename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); + final config = await fsReadFileAsJson(filename); + return config["items"] ?? []; + } + Future> listInstalledApplicationList() async { + final filename = path.join(_getEtcBaseDir(), "nodebase", "app-list.json"); + final config = await fsReadFileAsJson(filename); + return config["items"] ?? []; + } + Future> readApplicationConfig(String name, String version) async { + final hash = await fsCalcStringHash("$name-$version"); + final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); + return await fsReadFileAsJson(filename); + } + Future writeApplicationConfig(String name, String version, Map json) async { + final hash = await fsCalcStringHash("$name-$version"); + final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); + await fsWriteFileAsJson(filename, json); + } + Future removeApplicationBinary(String name, String version) async { + final hash = await fsCalcStringHash("$name-$version"); + final dir = Directory(path.join(_getApplicationBaseDir(), hash)); + await _configListRemove("app-list.json", name, version); + if (!dir.existsSync()) return; + dir.delete(recursive: true); + } + + Future> listAvailablePlatformList() async { + final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); + final config = await fsReadFileAsJson(filename); + return config["items"] ?? []; + } + Future> listInstalledPlatformList() async { + final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); + final config = await fsReadFileAsJson(filename); + return config["items"] ?? []; + } + Future> listPlatformExecutableList(String name, String version) async { + final meta = await readPlatformMetaJson(name, version); + return meta["executable"] ?? []; + } + Future> readPlatformConfig(String name, String version) async { + final hash = await fsCalcStringHash("$name-$version"); + final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); + return await fsReadFileAsJson(filename); + } + Future writePlatformConfig(String name, String version, Map json) async { + final hash = await fsCalcStringHash("$name-$version"); + final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); + await fsWriteFileAsJson(filename, json); + } + Future removePlatformBinary(String name, String version) async { + final hash = await fsCalcStringHash("$name-$version"); + final dir = Directory(path.join(_getPlatformBaseDir(), hash)); + await _configListRemove("plm-list.json", name, version); + if (!dir.existsSync()) return; + dir.delete(recursive: true); + } } \ No newline at end of file From bb3b8bf57b3abe03b75184f977d0537278666466 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 3 Feb 2024 15:20:18 +0800 Subject: [PATCH 025/125] dart: use relative import path for in-package module --- lib/ctrl/platform.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index a1c6407..157d489 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -2,9 +2,9 @@ import 'dart:async'; import 'dart:io'; -import 'package:nodebase/util/api.dart'; import 'package:path/path.dart' as path; +import '../util/api.dart'; import '../util/fs.dart'; import '../util/event.dart' as event; From 59cc069f0bf1e00a018532b60b03e876141c2939 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 4 Feb 2024 11:42:12 +0800 Subject: [PATCH 026/125] bugfix: ensure basic nodebase init process works - download app/platform list to correct file path - ensure read list correctly --- lib/ctrl/nodebase.dart | 7 ++++++- lib/ctrl/platform.dart | 25 ++++++++++++++++++++----- lib/util/event.dart | 3 ++- lib/util/fs.dart | 8 ++++---- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 5805217..4904f8b 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -4,7 +4,8 @@ import '../util/fs.dart'; import '../util/api.dart'; import '../util/event.dart' as event; -const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; +//const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; +const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; class NodeBaseController { late Application application; @@ -21,6 +22,10 @@ class NodeBaseController { application = Application(baseDir: appBaseDir); // TODO: read user settings, app list, platform list // get latest app, platform list from remote + await platform.downloadNodeBaseJson(); + // TODO: check platform version; if no change, skip download list + await platform.downloadApplicationListJson(); + await platform.downloadPlatformListJson(); event.initializeToken.add(true); } } diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 157d489..921c36a 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -66,6 +66,7 @@ import '../util/event.dart' as event; * /workspace/etc/plm/(-)/... * - name * - version + * - source * - executable * - filename * - type=exe,none @@ -113,6 +114,7 @@ class Platform { final signal = StreamController(); final done = Completer(); cancel ??= StreamController(); + await fsGuaranteeDir(targetFilename); event.platformToken.add([name, targetFilename, 0]); final download = fsProgressDownload(targetFilename, url, signal, cancel); signal.stream.listen((message) { @@ -189,6 +191,7 @@ class Platform { } } Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}) async { + // python3 -c 'from hashlib import sha256; x="node-v20.11.0";print(x, sha256(x.encode("utf-8")).hexdigest())' final hash = await fsCalcStringHash("$name-$version"); final tmpFilename = path.join(_getTmpBaseDir(), "app-$hash-meta.json"); final doing = downloadQueue[tmpFilename]; @@ -197,7 +200,7 @@ class Platform { downloadQueue[tmpFilename] = action.future; try { await _downloadFile("app-$name-$version.json", "$baseUrl/app/$os/$arch/$hash.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "app", "$hash.json"); + final targetFilename = path.join(_getEtcBaseDir(), "app", hash, "meta.json"); await fsGuaranteeDir(targetFilename); final tmpFile = File(tmpFilename); await tmpFile.copy(targetFilename); @@ -218,7 +221,7 @@ class Platform { downloadQueue[tmpFilename] = action.future; try { await _downloadFile("plm-$name-$version.json", "$baseUrl/plm/$os/$arch/$hash.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "app", "$hash.json"); + final targetFilename = path.join(_getEtcBaseDir(), "plm", hash, "meta.json"); await fsGuaranteeDir(targetFilename); final tmpFile = File(tmpFilename); await tmpFile.copy(targetFilename); @@ -344,16 +347,28 @@ class Platform { Future> listAvailablePlatformList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); final config = await fsReadFileAsJson(filename); - return config["items"] ?? []; + List r = []; + for (final one in config["items"] ?? []) { + r.add(one.toString()); + } + return r; } Future> listInstalledPlatformList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); final config = await fsReadFileAsJson(filename); - return config["items"] ?? []; + List r = []; + for (final one in config["items"] ?? []) { + r.add(one.toString()); + } + return r; } Future> listPlatformExecutableList(String name, String version) async { final meta = await readPlatformMetaJson(name, version); - return meta["executable"] ?? []; + List r = []; + for (final one in meta["executable"] ?? []) { + r.add(one.toString()); + } + return r; } Future> readPlatformConfig(String name, String version) async { final hash = await fsCalcStringHash("$name-$version"); diff --git a/lib/util/event.dart b/lib/util/event.dart index 25c43ff..151980b 100755 --- a/lib/util/event.dart +++ b/lib/util/event.dart @@ -1,4 +1,5 @@ import 'dart:async'; final initializeToken = StreamController(); -final platformToken = StreamController(); \ No newline at end of file +final platformToken = StreamController(); +final nodebaseToken = StreamController(); \ No newline at end of file diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 0a6c67e..8c624d4 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -249,24 +249,24 @@ Future fsProgressDownload( // Calculate and print the download progress double progressRate = contentLength == 0 ? 1 : (downloadedLength / contentLength); - progressToken.add([downloadedLength, contentLength, progressRate]); + if (!progressToken.isClosed) progressToken.add([downloadedLength, contentLength, progressRate]); log('NodeBase [D] fsProgressDownload ... progress ${(progressRate * 100).toStringAsFixed(2)}%'); }, onDone: () async { // Close the fileSink to ensure all bytes are written await fileSink.close(); - progressToken.add([-1, contentLength, 1]); + if (!progressToken.isClosed) progressToken.add([-1, contentLength, 1]); log('NodeBase [D] fsProgressDownload ... complete $filename'); }, onError: (e) { - progressToken.add([-1, contentLength, -1]); + if (!progressToken.isClosed) progressToken.add([-1, contentLength, -1]); log('NodeBase [E] fsProgressDownload ... $e'); }, cancelOnError: true, ); cancelToken.stream.listen((_) { - progressToken.add([-1, contentLength, -1]); + if (!progressToken.isClosed) progressToken.add([-1, contentLength, -1]); subscription.cancel(); fileSink.close(); httpClient.close(); From 7503397be0a7462b5f08af11d3d143da15ee19ab Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 4 Feb 2024 11:48:53 +0800 Subject: [PATCH 027/125] test: add smoke test for util/fs.dart hash functions --- test/util_fs_test.dart | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 test/util_fs_test.dart diff --git a/test/util_fs_test.dart b/test/util_fs_test.dart new file mode 100755 index 0000000..0575923 --- /dev/null +++ b/test/util_fs_test.dart @@ -0,0 +1,14 @@ +import 'dart:io'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:path/path.dart' as path; +import 'package:nodebase/util/fs.dart'; + +void main() { + test('hash functions (file, string) should work correctly', () async { + final baseDir = path.dirname(Platform.script.toFilePath()); + final testfile = path.join(baseDir, 'asset', 'image', 'logo.png'); + expect(await fsCalcHash(testfile), "9c3cfce62af42b32b3ad94e40594869065fcf936dff200a7cc042198d218fcec"); + expect(await fsCalcStringHash("logo.png"), "ab211233b6576dbb0f8b5826447eeac61e2a833a99ac5d788fbc1a174c3c6ce5"); + }); +} From e7cd8db7b16ba9482e8b447427d761917e89ccc0 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 4 Feb 2024 11:55:50 +0800 Subject: [PATCH 028/125] dart: platform - change app/platform list as map instead of list - prev: list - current: map --- lib/ctrl/platform.dart | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 921c36a..d94879f 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -344,21 +344,37 @@ class Platform { dir.delete(recursive: true); } - Future> listAvailablePlatformList() async { + Future>> listAvailablePlatformList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); final config = await fsReadFileAsJson(filename); - List r = []; + Map> r = {}; for (final one in config["items"] ?? []) { - r.add(one.toString()); + final onestr = one.toString(); + final i = onestr.indexOf('-'); + final name = onestr.substring(0, i); + final version = onestr.substring(i+1); + if (r.containsKey(name)) { + r[name]?.add(version); + } else { + r[name] = [version]; + } } return r; } - Future> listInstalledPlatformList() async { + Future>> listInstalledPlatformList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); final config = await fsReadFileAsJson(filename); - List r = []; + Map> r = {}; for (final one in config["items"] ?? []) { - r.add(one.toString()); + final onestr = one.toString(); + final i = onestr.indexOf('-'); + final name = onestr.substring(0, i); + final version = onestr.substring(i+1); + if (r.containsKey(name)) { + r[name]?.add(version); + } else { + r[name] = [version]; + } } return r; } From ecdade31b34e389f723b06dfd1af54bdaa781af8 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 4 Feb 2024 12:39:49 +0800 Subject: [PATCH 029/125] dart: bugfix - ensure download finish and return as async --- lib/util/fs.dart | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index 8c624d4..da65238 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -221,6 +221,7 @@ Future fsProgressDownload( StreamController cancelToken) async { // ref: filled by GPT 4 turbo and optimized final httpClient = HttpClient(); + final done = Completer(); try { // Parse the URL final uri = Uri.parse(url); @@ -249,37 +250,43 @@ Future fsProgressDownload( // Calculate and print the download progress double progressRate = contentLength == 0 ? 1 : (downloadedLength / contentLength); - if (!progressToken.isClosed) progressToken.add([downloadedLength, contentLength, progressRate]); + progressToken.add([downloadedLength, contentLength, progressRate]); log('NodeBase [D] fsProgressDownload ... progress ${(progressRate * 100).toStringAsFixed(2)}%'); }, onDone: () async { // Close the fileSink to ensure all bytes are written await fileSink.close(); - if (!progressToken.isClosed) progressToken.add([-1, contentLength, 1]); + progressToken.add([-1, contentLength, 1]); log('NodeBase [D] fsProgressDownload ... complete $filename'); + done.complete(); }, onError: (e) { - if (!progressToken.isClosed) progressToken.add([-1, contentLength, -1]); + progressToken.add([-1, contentLength, -1]); log('NodeBase [E] fsProgressDownload ... $e'); + done.complete('error'); }, cancelOnError: true, ); cancelToken.stream.listen((_) { - if (!progressToken.isClosed) progressToken.add([-1, contentLength, -1]); + progressToken.add([-1, contentLength, -1]); subscription.cancel(); fileSink.close(); + done.complete('cancel'); httpClient.close(); }); } else { log('NodeBase [E] fsProgressDownload ... http ${response.statusCode}'); + done.complete('error'); } } catch (e) { - log('NodeBase [E] fsProgressDownload ... $e'); + log('NodeBase [E] fsProgressDownload ... $e - $url'); + done.complete('error'); } finally { - progressToken.close(); - cancelToken.close(); + await done.future; httpClient.close(); + await progressToken.close(); + await cancelToken.close(); } } From 5d2e6405981ebf23649a9abafddcba26123be221 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 13:55:43 +0800 Subject: [PATCH 030/125] dart: add is supported function in platform.dart --- lib/ctrl/nodebase.dart | 3 +++ lib/ctrl/platform.dart | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 4904f8b..682c33d 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -10,6 +10,7 @@ const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; class NodeBaseController { late Application application; late Platform platform; + bool isSupported = false; Future initializeApp() async { final parts = (await NodeBaseApi.apiUtilGetArch()).split("|")[0].split("-"); @@ -26,6 +27,8 @@ class NodeBaseController { // TODO: check platform version; if no change, skip download list await platform.downloadApplicationListJson(); await platform.downloadPlatformListJson(); + + isSupported = await platform.isSupported(); event.initializeToken.add(true); } } diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index d94879f..016af55 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -94,6 +94,10 @@ class Platform { String _getPlatformBaseDir() => path.join(baseDir, "workspace", "plm"); void changeBaseUrl(String url) { baseUrl = url; } + Future isSupported() async { + final config = await readNodeBaseJson(); + return config.containsKey("platform-$os-$arch"); + } Future> readNodeBaseJson() async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "nodebase.json")); @@ -286,7 +290,7 @@ class Platform { await NodeBaseApi.apiUtilMarkExecutable(targetFilename); } await tmpFile.delete(); - await _configListRemove("plm-list.json", name, version); + await _configListAdd("plm-list.json", name, version); } catch (e) { action.completeError(e); } finally { @@ -297,7 +301,11 @@ class Platform { Future _configListAdd(String target, String name, String version) async { final filename = path.join(_getEtcBaseDir(), "nodebase", target); final config = await fsReadFileAsJson(filename); - List list = config["items"] ?? []; + List list_ = config["items"] ?? []; + List list = []; + for (final one in list_) { + list.add(one.toString()); + } final addone = "$name-$version"; if (!list.contains(addone)) list.add(addone); config["items"] = list; @@ -306,7 +314,11 @@ class Platform { Future _configListRemove(String target, String name, String version) async { final filename = path.join(_getEtcBaseDir(), "nodebase", target); final config = await fsReadFileAsJson(filename); - List list = config["items"] ?? []; + List list_ = config["items"] ?? []; + List list = []; + for (final one in list_) { + list.add(one.toString()); + } final addone = "$name-$version"; int i = list.indexOf(addone); if (i >= 0) { @@ -316,15 +328,39 @@ class Platform { await fsWriteFileAsJson(filename, config); } - Future> listAvailableApplicationList() async { + Future>> listAvailableApplicationList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); final config = await fsReadFileAsJson(filename); - return config["items"] ?? []; + Map> r = {}; + for (final one in config["items"] ?? []) { + final onestr = one.toString(); + final i = onestr.indexOf('-'); + final name = onestr.substring(0, i); + final version = onestr.substring(i+1); + if (r.containsKey(name)) { + r[name]?.add(version); + } else { + r[name] = [version]; + } + } + return r; } - Future> listInstalledApplicationList() async { + Future>> listInstalledApplicationList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "app-list.json"); final config = await fsReadFileAsJson(filename); - return config["items"] ?? []; + Map> r = {}; + for (final one in config["items"] ?? []) { + final onestr = one.toString(); + final i = onestr.indexOf('-'); + final name = onestr.substring(0, i); + final version = onestr.substring(i+1); + if (r.containsKey(name)) { + r[name]?.add(version); + } else { + r[name] = [version]; + } + } + return r; } Future> readApplicationConfig(String name, String version) async { final hash = await fsCalcStringHash("$name-$version"); @@ -341,7 +377,7 @@ class Platform { final dir = Directory(path.join(_getApplicationBaseDir(), hash)); await _configListRemove("app-list.json", name, version); if (!dir.existsSync()) return; - dir.delete(recursive: true); + await dir.delete(recursive: true); } Future>> listAvailablePlatformList() async { @@ -401,6 +437,8 @@ class Platform { final dir = Directory(path.join(_getPlatformBaseDir(), hash)); await _configListRemove("plm-list.json", name, version); if (!dir.existsSync()) return; - dir.delete(recursive: true); + // XXX: by default, on windows, MAX_PATh = 260, if too long, will fail + // ref: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry + await dir.delete(recursive: true); } } \ No newline at end of file From 6a8b5efe170187c5a5fd5cd31e03d2f0bc5e46d1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 13:58:30 +0800 Subject: [PATCH 031/125] windows: add long path support in manifest --- windows/runner/runner.exe.manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest index 157e871..fbff8fc 100755 --- a/windows/runner/runner.exe.manifest +++ b/windows/runner/runner.exe.manifest @@ -3,6 +3,7 @@ PerMonitorV2 + true From 37b65a515851611b2d7d184ed0a52b6e6c64ca6b Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 13:59:11 +0800 Subject: [PATCH 032/125] dart: minor - remove unused comment --- lib/page/splash.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/page/splash.dart b/lib/page/splash.dart index 302537c..4d5f562 100755 --- a/lib/page/splash.dart +++ b/lib/page/splash.dart @@ -55,7 +55,6 @@ class _SplashPageState extends State { @override Widget build(BuildContext context) { - // TODO: implement build return const Scaffold( body: Center( child: Column( From 3bce18c2344cb9ea2f268cdcd600974e349248b5 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 14:44:08 +0800 Subject: [PATCH 033/125] dart: bugfix - missing await for create directory --- lib/util/fs.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index da65238..d5cd93d 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -199,7 +199,7 @@ Future fsUnzipFiles(String zipFilename, String dstDir) async { Future fsGuaranteeDir(String filename) async { final dir = Directory(path.dirname(filename)); if (!dir.existsSync()) { - dir.create(recursive: true); + await dir.create(recursive: true); } } From 105b59a281a08011838895a9e762dcab9d306d73 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 14:45:03 +0800 Subject: [PATCH 034/125] dart: add page for not support platforms --- lib/page/notSupported.dart | 71 ++++++++++++++++++++++++++++++++++++++ lib/page/splash.dart | 14 ++++---- 2 files changed, 79 insertions(+), 6 deletions(-) create mode 100755 lib/page/notSupported.dart diff --git a/lib/page/notSupported.dart b/lib/page/notSupported.dart new file mode 100755 index 0000000..2066926 --- /dev/null +++ b/lib/page/notSupported.dart @@ -0,0 +1,71 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import '../ctrl/nodebase.dart' as nodebase; + +class NotSupportedPage extends StatefulWidget { + const NotSupportedPage({super.key}); + + @override + State createState() => _NotSupportedPageState(); +} + +class _NotSupportedPageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const Image(image: AssetImage('asset/image/logo.png')), + const Text( + "\nNodeBase", + style: TextStyle(fontSize: 24, color: Color.fromARGB(128, 0, 0, 0)), + ), + Row( + children: [ + const Spacer(), + Row( + children: [ + Column( + children: [ + const Text( + "Sorry, we are not yet have", + style: TextStyle(color: Color.fromARGB(128, 0, 0, 0)), + ), + Row( + children: [ + const Text( + "support for ", + style: TextStyle(color: Color.fromARGB(128, 0, 0, 0)), + ), + Text( + "\"${nodebase.instance.platform.os} ${nodebase.instance.platform.arch}\"", + style: const TextStyle(color: Color.fromARGB(255, 255, 128, 128)), + ), + ], + ), + const Text(" "), + ], + ), + ] + ), + const Spacer(), + ], + ), + ElevatedButton(onPressed: () => { + if (Platform.isAndroid) { + SystemChannels.platform.invokeMethod('SystemNavigator.pop') + } else { + exit(0) + } + }, child: const Text("Exit")) + ], + ), + ), + ); + } +} \ No newline at end of file diff --git a/lib/page/splash.dart b/lib/page/splash.dart index 4d5f562..034aed9 100755 --- a/lib/page/splash.dart +++ b/lib/page/splash.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:nodebase/page/notSupported.dart'; import '../util/event.dart' as event; import '../ctrl/nodebase.dart' as nodebase; @@ -25,12 +26,13 @@ class _SplashPageState extends State { } }); splashWait().then((_) { - // TODO: go to correct page according to current state - // Navigator.pushAndRemoveUntil( - // context, - // MaterialPageRoute(builder: (context) => NextPage()), - // (Route route) => false, - // ) + if (!nodebase.instance.isSupported) { + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute(builder: (context) => const NotSupportedPage()), + (Route route) => false, + ); + } }); // debug: Future.delayed(const Duration(seconds: 8)).then((_) => event.initializeToken.add(true)); } From edb621feed20f1fa1cd819bd981eb9476c460b71 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 5 Feb 2024 15:14:29 +0800 Subject: [PATCH 035/125] dart: ensure Future can finish for download even error --- lib/util/fs.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/util/fs.dart b/lib/util/fs.dart index d5cd93d..d270ee1 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -222,6 +222,7 @@ Future fsProgressDownload( // ref: filled by GPT 4 turbo and optimized final httpClient = HttpClient(); final done = Completer(); + bool canCancel = false; try { // Parse the URL final uri = Uri.parse(url); @@ -268,6 +269,7 @@ Future fsProgressDownload( cancelOnError: true, ); + canCancel = true; cancelToken.stream.listen((_) { progressToken.add([-1, contentLength, -1]); subscription.cancel(); @@ -286,7 +288,8 @@ Future fsProgressDownload( await done.future; httpClient.close(); await progressToken.close(); - await cancelToken.close(); + // if no stream listener, it will hang there + if (canCancel) await cancelToken.close(); } } From 69d7fad0339c3436f53fa15529af11ac24e4d3f6 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 18:03:12 +0800 Subject: [PATCH 036/125] dart: ApplicationProcess, env can be init when create - ApplicationProcess(name, cmd, env) ^ add this --- lib/ctrl/application.dart | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart index e18bad7..5a817a1 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application.dart @@ -8,19 +8,22 @@ class ApplicationProcess { ApplicationProcess({ required this.name, required this.cmd, + this.platform = "-", + this.env = const {}, }); String name; List cmd; - Map env = {}; + Map env; + String platform; String state = "new"; - void start() { - NodeBaseApi.apiAppStart(name, cmd, env: env); + Future start() async { + await NodeBaseApi.apiAppStart(name, cmd, env: env); } - void stop() { - NodeBaseApi.apiAppStop(name); + Future stop() async { + await NodeBaseApi.apiAppStop(name); } Future syncState() async { @@ -57,8 +60,7 @@ class Application { } void startProcess(String name, List cmd, Map env) { - final app = ApplicationProcess(name: name, cmd: cmd); - app.env = env; + final app = ApplicationProcess(name: name, cmd: cmd, env: env); // XXX: if we want sandbox to run applications, // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl // on Linux, Android, consider proot From c923e48ac59f926712734f7efcee28bfbd9752bd Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 18:04:38 +0800 Subject: [PATCH 037/125] dart: nodebase module - add try catch for download - ensure if download fails but there are cached json, it should work normally --- lib/ctrl/nodebase.dart | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 682c33d..27605e3 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import '../ctrl/application.dart'; import '../ctrl/platform.dart'; import '../util/fs.dart'; @@ -21,14 +23,27 @@ class NodeBaseController { // TODO: read app config and get default base url platform = Platform(baseUrl: baseUrl, baseDir: appBaseDir, os: os, arch: arch); application = Application(baseDir: appBaseDir); - // TODO: read user settings, app list, platform list - // get latest app, platform list from remote - await platform.downloadNodeBaseJson(); + try { + // TODO: read user settings, app list, platform list + // get latest app, platform list from remote + await platform.downloadNodeBaseJson(); + } catch (e) { + log("NodeBase [E] cannot download nodebase.json"); + } + isSupported = await platform.isSupported(); // TODO: check platform version; if no change, skip download list - await platform.downloadApplicationListJson(); - await platform.downloadPlatformListJson(); + try { + await platform.downloadApplicationListJson(); + } catch(e) { + log("NodeBase [E] cannot download app-list.json.json"); + } + + try { + await platform.downloadPlatformListJson(); + } catch(e) { + log("NodeBase [E] cannot download plm-list.json"); + } - isSupported = await platform.isSupported(); event.initializeToken.add(true); } } From e1783ebb0ede4478a20b81d21ba50abee4ee0223 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 18:06:00 +0800 Subject: [PATCH 038/125] dart: platform module - make download cancellable outside - add API to cancel downloading - make download queue private --- lib/ctrl/platform.dart | 86 ++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 016af55..7f7ca5d 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -75,6 +75,16 @@ import '../util/event.dart' as event; * /workspace/plm/... */ +class _DownloadItem { + _DownloadItem({ + required this.action, + required this.cancel, + }); + + final Completer action; + final StreamController cancel; +} + class Platform { Platform({ required this.baseUrl, @@ -86,7 +96,7 @@ class Platform { String os; String arch; - Map downloadQueue = {}; + final Map _downloadQueue = {}; String _getEtcBaseDir() => path.join(baseDir, "workspace", "etc"); String _getTmpBaseDir() => path.join(baseDir, "workspace", "tmp"); @@ -116,7 +126,6 @@ class Platform { String targetFilename, StreamController? cancel) async { final signal = StreamController(); - final done = Completer(); cancel ??= StreamController(); await fsGuaranteeDir(targetFilename); event.platformToken.add([name, targetFilename, 0]); @@ -130,16 +139,15 @@ class Platform { event.platformToken.add([name, targetFilename, progress]); } }); - download.onError((error, stackTrace) => done.completeError(error!, stackTrace)); - download.then((_) => done.complete()); - return done.future; + return download; } Future downloadNodeBaseJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "nodebase.json"); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("nodebase.json", "$baseUrl/nodebase.json", tmpFilename, cancel); final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); @@ -151,15 +159,16 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadApplicationListJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "app-$os-$arch.json"); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("app-$os-$arch.json", "$baseUrl/app-$os-$arch.json", tmpFilename, cancel); final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); @@ -171,15 +180,16 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadPlatformListJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "plm-$os-$arch.json"); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("plm-$os-$arch.json", "$baseUrl/plm-$os-$arch.json", tmpFilename, cancel); final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); @@ -191,17 +201,18 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}) async { // python3 -c 'from hashlib import sha256; x="node-v20.11.0";print(x, sha256(x.encode("utf-8")).hexdigest())' final hash = await fsCalcStringHash("$name-$version"); final tmpFilename = path.join(_getTmpBaseDir(), "app-$hash-meta.json"); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("app-$name-$version.json", "$baseUrl/app/$os/$arch/$hash.json", tmpFilename, cancel); final targetFilename = path.join(_getEtcBaseDir(), "app", hash, "meta.json"); @@ -213,16 +224,17 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final tmpFilename = path.join(_getTmpBaseDir(), "plm-$hash-meta.json"); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("plm-$name-$version.json", "$baseUrl/plm/$os/$arch/$hash.json", tmpFilename, cancel); final targetFilename = path.join(_getEtcBaseDir(), "plm", hash, "meta.json"); @@ -234,17 +246,18 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadApplicationBinary(String name, String version, String url, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final baseName = path.basename(url); final tmpFilename = path.join(_getTmpBaseDir(), baseName); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("app-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); @@ -262,17 +275,18 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final baseName = path.basename(url); final tmpFilename = path.join(_getTmpBaseDir(), baseName); - final doing = downloadQueue[tmpFilename]; - if (doing != null) return await doing; + final doing = _downloadQueue[tmpFilename]; + if (doing != null) return await doing.action.future; final action = Completer(); - downloadQueue[tmpFilename] = action.future; + cancel ??= StreamController(); + _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("plm-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); @@ -294,9 +308,15 @@ class Platform { } catch (e) { action.completeError(e); } finally { - downloadQueue.remove(tmpFilename); + _downloadQueue.remove(tmpFilename); } } + Future downloadCancel(String targeFilename) async { + final doing = _downloadQueue[targeFilename]; + if (doing == null) return; + doing.cancel.add(true); + await doing.action.future; + } Future _configListAdd(String target, String name, String version) async { final filename = path.join(_getEtcBaseDir(), "nodebase", target); From 000ee3d8c0af55314a44cd14e86acaca81bff10a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 18:08:08 +0800 Subject: [PATCH 039/125] dart: AppRuntimeTile - running app tile - can - get info of running app - show cmd - show env - stop running app - add util to generate SnackBar --- lib/comp/AppRuntimeTile.dart | 115 +++++++++++++++++++++++++++++++++++ lib/comp/util.dart | 18 ++++++ 2 files changed, 133 insertions(+) create mode 100755 lib/comp/AppRuntimeTile.dart create mode 100755 lib/comp/util.dart diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/AppRuntimeTile.dart new file mode 100755 index 0000000..57816ec --- /dev/null +++ b/lib/comp/AppRuntimeTile.dart @@ -0,0 +1,115 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import './util.dart'; +import '../ctrl/application.dart'; +import '../util/event.dart' as event; +import '../ctrl/nodebase.dart' as nodebase; + +class AppRuntimeTile extends StatefulWidget { + const AppRuntimeTile({super.key, required this.process}); + + final ApplicationProcess process; + + @override + State createState() => _AppRuntimeTileState(); +} + +class _AppRuntimeTileState extends State { + + @override + void initState() { + super.initState(); + } + + @override + void dispose() { + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return ListTile( + title: Text(widget.process.name), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("platform: ${widget.process.platform}"), + ], + ), + trailing: Wrap( + spacing: 2, + children: [ + IconButton(onPressed: () { + showInfo(context); + }, icon: const Icon(Icons.info_outline)), + IconButton(onPressed: () { + confirmStop(context).then((confirmed) { + if (!confirmed) return; + widget.process.stop().then((_) { + generateSnackBar( + context, + "Stopped application \"${widget.process.name}\"" + ); + }); + }); + }, icon: const Icon(Icons.stop)), + ], + ), + tileColor: Color.fromARGB(255, 230, 255, 230), + ); + } + + void showInfo(BuildContext context) { + final cmdMain = widget.process.cmd[0]; + final cmdEntry = widget.process.cmd.length > 1 ? "\n${widget.process.cmd[1]}" : ""; + showDialog(context: context, builder: (_) => AlertDialog( + title: const Text("Application Info"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + const Text("-- CMD -- "), + SelectableText("$cmdMain$cmdEntry"), + const Divider(), + const Text("-- ENV --"), + SelectableText(widget.process.env.entries.map( + (kv) => "${kv.key} =\n${kv.value}" + ).toList().join("\n\n")), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text("OK")), + ], + )); + } + + Future confirmStop(BuildContext context) async { + final ok = Completer(); + final dialog = AlertDialog( + title: const Text("Stop Application"), + shape: BeveledRectangleBorder(), + content: Text("Do you confirm to stop the application \"${widget.process.name}\""), + actions: [ + TextButton(onPressed: () { + Navigator.of(context).pop(); + ok.complete(false); + }, child: const Text("Cancel")), + ElevatedButton(onPressed: () { + Navigator.of(context).pop(); + ok.complete(true); + }, child: const Text("Stop")), + ], + ); + showDialog(context: context, builder: (_) => dialog); + return ok.future; + } +} \ No newline at end of file diff --git a/lib/comp/util.dart b/lib/comp/util.dart new file mode 100755 index 0000000..e1e8c36 --- /dev/null +++ b/lib/comp/util.dart @@ -0,0 +1,18 @@ +import 'package:flutter/material.dart'; + +SnackBar generateSnackBar(BuildContext context, String content, { + Duration duration = const Duration(seconds: 2) +}) { + final snackBar = SnackBar( + content: Text(content), + action: SnackBarAction( + label: "X", + onPressed: () { + ScaffoldMessenger.of(context).hideCurrentSnackBar(); + } + ), + duration: duration, + ); + ScaffoldMessenger.of(context).showSnackBar(snackBar); + return snackBar; +} \ No newline at end of file From 53b875d13433b1c47ad3a2c3c4ae3ac6258c52ba Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 18:10:04 +0800 Subject: [PATCH 040/125] dart: DownloadTile - downloading tile - can - get downloading type and name-version - get downloading full url - show downloading progress if content length is available - cancel downloading --- lib/comp/DownloadTile.dart | 100 +++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100755 lib/comp/DownloadTile.dart diff --git a/lib/comp/DownloadTile.dart b/lib/comp/DownloadTile.dart new file mode 100755 index 0000000..d40fd62 --- /dev/null +++ b/lib/comp/DownloadTile.dart @@ -0,0 +1,100 @@ +import 'package:flutter/material.dart'; +import './util.dart'; +import '../util/event.dart' as event; +import '../ctrl/nodebase.dart' as nodebase; + +class DownloadTile extends StatefulWidget { + const DownloadTile({ + super.key, + required this.name, + required this.type, + required this.url, + required this.filename, + }); + + final String name; + final String type; + final String url; + final String filename; + + @override + State createState() => _DownloadTileState(); +} + +class _DownloadTileState extends State with TickerProviderStateMixin { + late AnimationController controller; + bool isDeterminate = false; + double progressValue = 0.0; + + void modeDeterminate(double value) => setState(() { + isDeterminate = true; + controller.stop(); + controller.value = value; + }); + void modeNonDeterminate() => setState(() { + isDeterminate = false; + controller + ..forward(from: controller.value) + ..repeat(); + }); + + @override + void initState() { + super.initState(); + controller = AnimationController( + vsync: this, + duration: const Duration(seconds: 1), + )..addListener(() { + setState(() {}); + }); + controller.repeat(); + } + + @override + void dispose() { + controller.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return ListTile( + title: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + const Text("download"), + Text( + "${widget.type} - ${widget.name}", + overflow: TextOverflow.ellipsis, + ), + ], + ), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SelectableText( + widget.url, + maxLines: 1, + ), + LinearProgressIndicator( + value: controller.value, + semanticsLabel: 'Linear progress indicator', + ), + ], + ), + trailing: Wrap( + spacing: 2, + children: [ + IconButton(onPressed: () { + nodebase.instance.platform.downloadCancel(widget.filename).then((_) { + generateSnackBar( + context, + "Canceled downloading for \"${widget.type} - ${widget.name}\"" + ); + }); + }, icon: const Icon(Icons.file_download_off)), + ], + ), + ); + } +} \ No newline at end of file From 247bde26a1a1ff01d3a2a837b4b8fc5b2afbf99b Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 6 Feb 2024 20:51:29 +0800 Subject: [PATCH 041/125] dart: refact confirmStop as showConfirmDialog - AppRuntimeTile:confirmStop -> util:showConfirmDialog --- lib/comp/AppRuntimeTile.dart | 29 +++++------------------------ lib/comp/util.dart | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/AppRuntimeTile.dart index 57816ec..0b12956 100755 --- a/lib/comp/AppRuntimeTile.dart +++ b/lib/comp/AppRuntimeTile.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:flutter/material.dart'; import './util.dart'; import '../ctrl/application.dart'; @@ -44,7 +42,11 @@ class _AppRuntimeTileState extends State { showInfo(context); }, icon: const Icon(Icons.info_outline)), IconButton(onPressed: () { - confirmStop(context).then((confirmed) { + showConfirmDialog( + context, + "Stop Application", + "Do you confirm to stop the application \"${widget.process.name}\"" + ).then((confirmed) { if (!confirmed) return; widget.process.stop().then((_) { generateSnackBar( @@ -91,25 +93,4 @@ class _AppRuntimeTileState extends State { ], )); } - - Future confirmStop(BuildContext context) async { - final ok = Completer(); - final dialog = AlertDialog( - title: const Text("Stop Application"), - shape: BeveledRectangleBorder(), - content: Text("Do you confirm to stop the application \"${widget.process.name}\""), - actions: [ - TextButton(onPressed: () { - Navigator.of(context).pop(); - ok.complete(false); - }, child: const Text("Cancel")), - ElevatedButton(onPressed: () { - Navigator.of(context).pop(); - ok.complete(true); - }, child: const Text("Stop")), - ], - ); - showDialog(context: context, builder: (_) => dialog); - return ok.future; - } } \ No newline at end of file diff --git a/lib/comp/util.dart b/lib/comp/util.dart index e1e8c36..381766d 100755 --- a/lib/comp/util.dart +++ b/lib/comp/util.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; SnackBar generateSnackBar(BuildContext context, String content, { @@ -15,4 +17,25 @@ SnackBar generateSnackBar(BuildContext context, String content, { ); ScaffoldMessenger.of(context).showSnackBar(snackBar); return snackBar; -} \ No newline at end of file +} + +Future showConfirmDialog(BuildContext context, String title, String content) async { + final ok = Completer(); + final dialog = AlertDialog( + title: Text(title), + shape: const BeveledRectangleBorder(), + content: Text(content), + actions: [ + TextButton(onPressed: () { + Navigator.of(context).pop(); + ok.complete(false); + }, child: const Text("Cancel")), + ElevatedButton(onPressed: () { + Navigator.of(context).pop(); + ok.complete(true); + }, child: const Text("Confirm")), + ], + ); + showDialog(context: context, builder: (_) => dialog); + return ok.future; +} From 9b1afdb3e5edd7e0f68430ca9914a93fe74ead3f Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 09:06:16 +0800 Subject: [PATCH 042/125] dart: add a missing '?' in text for stop app --- lib/comp/AppRuntimeTile.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/AppRuntimeTile.dart index 0b12956..a64f605 100755 --- a/lib/comp/AppRuntimeTile.dart +++ b/lib/comp/AppRuntimeTile.dart @@ -45,7 +45,7 @@ class _AppRuntimeTileState extends State { showConfirmDialog( context, "Stop Application", - "Do you confirm to stop the application \"${widget.process.name}\"" + "Do you confirm to stop the application \"${widget.process.name}\"?" ).then((confirmed) { if (!confirmed) return; widget.process.stop().then((_) { From 5bb3d31f793eeb79bdd2d413b100638ab6465a34 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 09:06:51 +0800 Subject: [PATCH 043/125] dart: init AppTile for application tile - install, delete, show info --- lib/comp/AppTile.dart | 147 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100755 lib/comp/AppTile.dart diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart new file mode 100755 index 0000000..c6bee7b --- /dev/null +++ b/lib/comp/AppTile.dart @@ -0,0 +1,147 @@ +import 'dart:developer'; + +import 'package:flutter/material.dart'; +import './util.dart'; +import '../ctrl/nodebase.dart' as nodebase; + +class AppTile extends StatefulWidget { + const AppTile({ + super.key, + required this.name, + required this.version, + required this.platform, + this.defaultInstalled = false, + }); + + final String name; + final String version; + final String platform; + final bool defaultInstalled; + + @override + State createState() => _AppTileState(); +} + +class _AppTileState extends State { + bool isInstalled = false; + + @override + void initState() { + super.initState(); + isInstalled = widget.defaultInstalled; + } + + @override + void dispose() { + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final List actions = []; + if (!isInstalled) { + actions.add(IconButton(onPressed: () { + (() async { + final name = widget.name; + final version = widget.version; + final confirmed = await showConfirmDialog( + context, + "Install Application", + "Do you confirm to install the application \"${name}-${version}\"?" + ); + if (!confirmed) return "cancel"; + final platform = nodebase.instance.platform; + try { + await platform.downloadApplicationMetaJson(name, version); + final json = await platform.readPlatformMetaJson(name, version); + final url = json["source"]; + await platform.downloadApplicationBinary(name, version, url); + return "ok"; + } catch (e) { + log("NodeBase [E] AppTile:install ${widget.name}-${widget.version} ... $e"); + return e.toString(); + } + })().then((r) { + if (r == "cancel") return; + if (r == "ok") { + generateSnackBar(context, "Installed application: \"${widget.name}-${widget.version}\""); + } else { + generateSnackBar(context, "Failed to install application: \"${widget.name}-${widget.version}\""); + } + }); + }, icon: const Icon(Icons.download))); + } + if (isInstalled) { + actions.add(IconButton(onPressed: () { + showInfo(context); + }, icon: const Icon(Icons.info_outline))); + actions.add(IconButton(onPressed: () { + // TODO: if platform is not installed, pop up a dialog for installation + // list all available name - {versions} + // TODO: pop up a dialog for exec, env set up + // read exec, env from last run or default value + // TODO: start + }, icon: const Icon(Icons.play_arrow))); + actions.add(IconButton(onPressed: () { + showConfirmDialog( + context, + "Remove Application", + "Do you confirm to remove the application \"${widget.name}-${widget.version}\"?" + ).then((confirmed) { + if (!confirmed) return; + nodebase.instance.platform.removeApplicationBinary(widget.name, widget.version).then((_) { + generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); + }); + }); + }, icon: const Icon(Icons.delete_forever))); + } + return ListTile( + title: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + "${widget.name}-${widget.version}", + overflow: TextOverflow.ellipsis, + ), + ], + ), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("platform: ${widget.platform}") + ], + ), + trailing: Wrap( + spacing: 2, + children: actions, + ), + ); + } + + void showInfo(BuildContext context) { + final name = widget.name; + final version = widget.version; + showDialog(context: context, builder: (_) => AlertDialog( + title: const Text("Application Info"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + const Text("-- Basic -- "), + SelectableText("$name-$version\n(${widget.platform})"), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text("OK")), + ], + )); + } +} \ No newline at end of file From 5b777182c7b9f75c360a4bd02af0ff78f5ab0ba1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 09:07:51 +0800 Subject: [PATCH 044/125] dart: PlatformTile for platform - install, delete, show info --- lib/comp/PlatformTile.dart | 144 +++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100755 lib/comp/PlatformTile.dart diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart new file mode 100755 index 0000000..45bf052 --- /dev/null +++ b/lib/comp/PlatformTile.dart @@ -0,0 +1,144 @@ +import 'dart:developer'; + +import 'package:flutter/material.dart'; +import './util.dart'; +import '../ctrl/nodebase.dart' as nodebase; + +class PlatformTile extends StatefulWidget { + const PlatformTile({ + super.key, + required this.name, + required this.version, + this.defaultInstalled = false, + }); + + final String name; + final String version; + final bool defaultInstalled; + + @override + State createState() => _AppTileState(); +} + +class _AppTileState extends State { + bool isInstalled = false; + + void setInstall(bool installed) { + setState(() { + isInstalled = installed; + }); + } + + @override + void initState() { + super.initState(); + isInstalled = widget.defaultInstalled; + } + + @override + void dispose() { + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final List actions = []; + if (!isInstalled) { + actions.add(IconButton(onPressed: () { + (() async { + final name = widget.name; + final version = widget.version; + final confirmed = await showConfirmDialog( + context, + "Install Platform", + "Do you confirm to install the platform \"${name}-${version}\"?" + ); + if (!confirmed) return "cancel"; + final platform = nodebase.instance.platform; + try { + await platform.downloadPlatformMetaJson(name, version); + final json = await platform.readPlatformMetaJson(name, version); + final url = json["source"]; + await platform.downloadPlatformBinary(name, version, url); + return "ok"; + } catch (e) { + log("NodeBase [E] PlatformTile:install ${widget.name}-${widget.version} ... $e"); + return e.toString(); + } + })().then((r) { + if (r == "cancel") return; + if (r == "ok") { + generateSnackBar(context, "Installed platform: \"${widget.name}-${widget.version}\""); + } else { + generateSnackBar(context, "Failed to install platform: \"${widget.name}-${widget.version}\""); + } + }); + }, icon: const Icon(Icons.download))); + } + if (isInstalled) { + actions.add(IconButton(onPressed: () { + showInfo(context); + }, icon: const Icon(Icons.info_outline))); + actions.add(IconButton(onPressed: () { + showConfirmDialog( + context, + "Remove Platform", + "Do you confirm to remove the platform \"${widget.name}-${widget.version}\"?" + ).then((confirmed) { + if (!confirmed) return; + nodebase.instance.platform.removePlatformBinary(widget.name, widget.version).then((_) { + generateSnackBar(context, "Removed platform: \"${widget.name}-${widget.version}\""); + }); + }); + }, icon: const Icon(Icons.delete_forever))); + } + return ListTile( + title: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + "${widget.name}-${widget.version}", + overflow: TextOverflow.ellipsis, + ), + ], + ), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("(${nodebase.instance.platform.os}-${nodebase.instance.platform.arch})") + ], + ), + trailing: Wrap( + spacing: 2, + children: actions, + ), + ); + } + + void showInfo(BuildContext context) { + final name = widget.name; + final version = widget.version; + showDialog(context: context, builder: (_) => AlertDialog( + title: const Text("Platform Info"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + const Text("-- Basic -- "), + SelectableText("$name-$version\n(${nodebase.instance.platform.os}-${nodebase.instance.platform.arch})"), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text("OK")), + ], + )); + } +} \ No newline at end of file From 12c5b10aa504eaaca778a31a42330208b52ad41a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 09:20:56 +0800 Subject: [PATCH 045/125] dart: AppTile, PlatformTile - change installed state correctly --- lib/comp/AppTile.dart | 10 ++++++++++ lib/comp/PlatformTile.dart | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index c6bee7b..bb5b87b 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -25,6 +25,12 @@ class AppTile extends StatefulWidget { class _AppTileState extends State { bool isInstalled = false; + void setInstall(bool installed) { + setState(() { + isInstalled = installed; + }); + } + @override void initState() { super.initState(); @@ -64,6 +70,7 @@ class _AppTileState extends State { })().then((r) { if (r == "cancel") return; if (r == "ok") { + setInstall(true); generateSnackBar(context, "Installed application: \"${widget.name}-${widget.version}\""); } else { generateSnackBar(context, "Failed to install application: \"${widget.name}-${widget.version}\""); @@ -83,6 +90,8 @@ class _AppTileState extends State { // TODO: start }, icon: const Icon(Icons.play_arrow))); actions.add(IconButton(onPressed: () { + // TODO: check if running, no remove + // TODO: try ... catch ... showConfirmDialog( context, "Remove Application", @@ -90,6 +99,7 @@ class _AppTileState extends State { ).then((confirmed) { if (!confirmed) return; nodebase.instance.platform.removeApplicationBinary(widget.name, widget.version).then((_) { + setInstall(false); generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); }); }); diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index 45bf052..5a09063 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -68,6 +68,7 @@ class _AppTileState extends State { })().then((r) { if (r == "cancel") return; if (r == "ok") { + setInstall(true); generateSnackBar(context, "Installed platform: \"${widget.name}-${widget.version}\""); } else { generateSnackBar(context, "Failed to install platform: \"${widget.name}-${widget.version}\""); @@ -80,6 +81,8 @@ class _AppTileState extends State { showInfo(context); }, icon: const Icon(Icons.info_outline))); actions.add(IconButton(onPressed: () { + // TODO: check if running, no remove + // TODO: try ... catch ... showConfirmDialog( context, "Remove Platform", @@ -87,6 +90,7 @@ class _AppTileState extends State { ).then((confirmed) { if (!confirmed) return; nodebase.instance.platform.removePlatformBinary(widget.name, widget.version).then((_) { + setInstall(false); generateSnackBar(context, "Removed platform: \"${widget.name}-${widget.version}\""); }); }); From a0a4fc7f36917875a71c020603e05a1f1ebbd19f Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 20:36:14 +0800 Subject: [PATCH 046/125] dart: AppTile PlatformTile: ensure state sync - state sync when the tile re-generated (state retained) - AppTile: add platform info --- lib/comp/AppTile.dart | 11 ++++++++--- lib/comp/PlatformTile.dart | 7 ++++++- lib/ctrl/platform.dart | 10 ++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index bb5b87b..fdd6b6c 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -23,6 +23,7 @@ class AppTile extends StatefulWidget { } class _AppTileState extends State { + AppTile? detect; bool isInstalled = false; void setInstall(bool installed) { @@ -45,6 +46,10 @@ class _AppTileState extends State { @override Widget build(BuildContext context) { final List actions = []; + if (detect != widget) { + isInstalled = widget.defaultInstalled; + detect = widget; + } if (!isInstalled) { actions.add(IconButton(onPressed: () { (() async { @@ -59,9 +64,9 @@ class _AppTileState extends State { final platform = nodebase.instance.platform; try { await platform.downloadApplicationMetaJson(name, version); - final json = await platform.readPlatformMetaJson(name, version); + final json = await platform.readApplicationMetaJson(name, version); final url = json["source"]; - await platform.downloadApplicationBinary(name, version, url); + await platform.downloadApplicationBinary(name, version, widget.platform, url); return "ok"; } catch (e) { log("NodeBase [E] AppTile:install ${widget.name}-${widget.version} ... $e"); @@ -98,7 +103,7 @@ class _AppTileState extends State { "Do you confirm to remove the application \"${widget.name}-${widget.version}\"?" ).then((confirmed) { if (!confirmed) return; - nodebase.instance.platform.removeApplicationBinary(widget.name, widget.version).then((_) { + nodebase.instance.platform.removeApplicationBinary(widget.name, widget.version, widget.platform).then((_) { setInstall(false); generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); }); diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index 5a09063..103f4c2 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'dart:developer'; import 'package:flutter/material.dart'; @@ -21,6 +22,7 @@ class PlatformTile extends StatefulWidget { } class _AppTileState extends State { + PlatformTile? detect; bool isInstalled = false; void setInstall(bool installed) { @@ -32,7 +34,6 @@ class _AppTileState extends State { @override void initState() { super.initState(); - isInstalled = widget.defaultInstalled; } @override @@ -43,6 +44,10 @@ class _AppTileState extends State { @override Widget build(BuildContext context) { final List actions = []; + if (detect != widget) { + isInstalled = widget.defaultInstalled; + detect = widget; + } if (!isInstalled) { actions.add(IconButton(onPressed: () { (() async { diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 7f7ca5d..1d76294 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -249,7 +249,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } - Future downloadApplicationBinary(String name, String version, String url, {StreamController? cancel}) async { + Future downloadApplicationBinary(String name, String version, String platform, String url, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final baseName = path.basename(url); final tmpFilename = path.join(_getTmpBaseDir(), baseName); @@ -271,7 +271,7 @@ class Platform { await tmpFile.copy(targetFilename); } await tmpFile.delete(); - await _configListAdd("app-list.json", name, version); + await _configListAdd("app-list.json", name, "$version:$platform"); } catch (e) { action.completeError(e); } finally { @@ -349,6 +349,7 @@ class Platform { } Future>> listAvailableApplicationList() async { + // name-version:platform final filename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); final config = await fsReadFileAsJson(filename); Map> r = {}; @@ -392,10 +393,10 @@ class Platform { final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); await fsWriteFileAsJson(filename, json); } - Future removeApplicationBinary(String name, String version) async { + Future removeApplicationBinary(String name, String version, String platform) async { final hash = await fsCalcStringHash("$name-$version"); final dir = Directory(path.join(_getApplicationBaseDir(), hash)); - await _configListRemove("app-list.json", name, version); + await _configListRemove("app-list.json", name, "$version:$platform"); if (!dir.existsSync()) return; await dir.delete(recursive: true); } @@ -418,6 +419,7 @@ class Platform { return r; } Future>> listInstalledPlatformList() async { + // name-version final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); final config = await fsReadFileAsJson(filename); Map> r = {}; From 65f1271b83c5efabbd1ba4e7e4d4312fc4fd47db Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 21:34:32 +0800 Subject: [PATCH 047/125] dart: AppTile PlatformTile - add status check for buttons - disable download when downloading - disable info, run, remove when removing - disable run, remove when running --- lib/comp/AppTile.dart | 75 +++++++++++++++++++++++--------------- lib/comp/PlatformTile.dart | 60 +++++++++++++++++++----------- 2 files changed, 84 insertions(+), 51 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index fdd6b6c..5becce8 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -26,6 +26,10 @@ class _AppTileState extends State { AppTile? detect; bool isInstalled = false; + bool isDownloading = false; + bool isRunning = false; + bool isRemoving = false; + void setInstall(bool installed) { setState(() { isInstalled = installed; @@ -50,8 +54,46 @@ class _AppTileState extends State { isInstalled = widget.defaultInstalled; detect = widget; } - if (!isInstalled) { - actions.add(IconButton(onPressed: () { + if (isInstalled) { + actions.add(IconButton(onPressed: isRemoving ? null : () { + showInfo(context); + }, icon: const Icon(Icons.info_outline))); + actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { + // TODO: if platform is not installed, pop up a dialog for installation + // list all available name - {versions} + // TODO: pop up a dialog for exec, env set up + // read exec, env from last run or default value + // TODO: start + }, icon: const Icon(Icons.play_arrow))); + actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { + // TODO: check if running, no remove + // TODO: try ... catch ... + showConfirmDialog( + context, + "Remove Application", + "Do you confirm to remove the application \"${widget.name}-${widget.version}\"?" + ).then((confirmed) { + if (!confirmed) return; + isRemoving = true; + (() async { + try { + await nodebase.instance.platform.removeApplicationBinary( + widget.name, widget.version, widget.platform); + return true; + } catch (e) { + log("NodeBase [E] AppTile ... remove application \"${widget.name}-${widget.version}\" $e"); + return false; + } + })().then((ok) { + isRemoving = false; + if (!ok) return; + setInstall(false); + generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); + }); + }); + }, icon: const Icon(Icons.delete_forever))); + } else { + actions.add(IconButton(onPressed: isDownloading ? null : () { (() async { final name = widget.name; final version = widget.version; @@ -61,6 +103,7 @@ class _AppTileState extends State { "Do you confirm to install the application \"${name}-${version}\"?" ); if (!confirmed) return "cancel"; + isDownloading = true; final platform = nodebase.instance.platform; try { await platform.downloadApplicationMetaJson(name, version); @@ -73,6 +116,7 @@ class _AppTileState extends State { return e.toString(); } })().then((r) { + isDownloading = false; if (r == "cancel") return; if (r == "ok") { setInstall(true); @@ -83,33 +127,6 @@ class _AppTileState extends State { }); }, icon: const Icon(Icons.download))); } - if (isInstalled) { - actions.add(IconButton(onPressed: () { - showInfo(context); - }, icon: const Icon(Icons.info_outline))); - actions.add(IconButton(onPressed: () { - // TODO: if platform is not installed, pop up a dialog for installation - // list all available name - {versions} - // TODO: pop up a dialog for exec, env set up - // read exec, env from last run or default value - // TODO: start - }, icon: const Icon(Icons.play_arrow))); - actions.add(IconButton(onPressed: () { - // TODO: check if running, no remove - // TODO: try ... catch ... - showConfirmDialog( - context, - "Remove Application", - "Do you confirm to remove the application \"${widget.name}-${widget.version}\"?" - ).then((confirmed) { - if (!confirmed) return; - nodebase.instance.platform.removeApplicationBinary(widget.name, widget.version, widget.platform).then((_) { - setInstall(false); - generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); - }); - }); - }, icon: const Icon(Icons.delete_forever))); - } return ListTile( title: Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index 103f4c2..f742c59 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -25,6 +25,10 @@ class _AppTileState extends State { PlatformTile? detect; bool isInstalled = false; + bool isDownloading = false; + bool isRunning = false; + bool isRemoving = false; + void setInstall(bool installed) { setState(() { isInstalled = installed; @@ -48,8 +52,38 @@ class _AppTileState extends State { isInstalled = widget.defaultInstalled; detect = widget; } - if (!isInstalled) { - actions.add(IconButton(onPressed: () { + if (isInstalled) { + actions.add(IconButton(onPressed: isRemoving ? null : () { + showInfo(context); + }, icon: const Icon(Icons.info_outline))); + actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { + // TODO: check if running, no remove + // TODO: try ... catch ... + showConfirmDialog( + context, + "Remove Platform", + "Do you confirm to remove the platform \"${widget.name}-${widget.version}\"?" + ).then((confirmed) { + if (!confirmed) return; + isRemoving = true; + (() async { + try { + await nodebase.instance.platform.removePlatformBinary(widget.name, widget.version); + return true; + } catch(e) { + log("NodeBase [E] PlatformTile ... remove platform \"${widget.name}-${widget.version}\" $e"); + return false; + } + })().then((ok) { + isRemoving = false; + if (!ok) return; + setInstall(false); + generateSnackBar(context, "Removed platform: \"${widget.name}-${widget.version}\""); + }); + }); + }, icon: const Icon(Icons.delete_forever))); + } else { + actions.add(IconButton(onPressed: isDownloading ? null : () { (() async { final name = widget.name; final version = widget.version; @@ -59,6 +93,7 @@ class _AppTileState extends State { "Do you confirm to install the platform \"${name}-${version}\"?" ); if (!confirmed) return "cancel"; + isDownloading = true; final platform = nodebase.instance.platform; try { await platform.downloadPlatformMetaJson(name, version); @@ -71,6 +106,7 @@ class _AppTileState extends State { return e.toString(); } })().then((r) { + isDownloading = false; if (r == "cancel") return; if (r == "ok") { setInstall(true); @@ -81,26 +117,6 @@ class _AppTileState extends State { }); }, icon: const Icon(Icons.download))); } - if (isInstalled) { - actions.add(IconButton(onPressed: () { - showInfo(context); - }, icon: const Icon(Icons.info_outline))); - actions.add(IconButton(onPressed: () { - // TODO: check if running, no remove - // TODO: try ... catch ... - showConfirmDialog( - context, - "Remove Platform", - "Do you confirm to remove the platform \"${widget.name}-${widget.version}\"?" - ).then((confirmed) { - if (!confirmed) return; - nodebase.instance.platform.removePlatformBinary(widget.name, widget.version).then((_) { - setInstall(false); - generateSnackBar(context, "Removed platform: \"${widget.name}-${widget.version}\""); - }); - }); - }, icon: const Icon(Icons.delete_forever))); - } return ListTile( title: Column( crossAxisAlignment: CrossAxisAlignment.stretch, From f07292ef6db11e11e0666520c3c022cd92e4d0be Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 7 Feb 2024 22:05:29 +0800 Subject: [PATCH 048/125] dart: DownloadTile - add state and polish canceling - disable cancel when canceling - add confirm for cancel --- lib/comp/DownloadTile.dart | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/comp/DownloadTile.dart b/lib/comp/DownloadTile.dart index d40fd62..8780af7 100755 --- a/lib/comp/DownloadTile.dart +++ b/lib/comp/DownloadTile.dart @@ -25,6 +25,7 @@ class _DownloadTileState extends State with TickerProviderStateMix late AnimationController controller; bool isDeterminate = false; double progressValue = 0.0; + bool isCanceling = false; void modeDeterminate(double value) => setState(() { isDeterminate = true; @@ -85,8 +86,20 @@ class _DownloadTileState extends State with TickerProviderStateMix trailing: Wrap( spacing: 2, children: [ - IconButton(onPressed: () { - nodebase.instance.platform.downloadCancel(widget.filename).then((_) { + IconButton(onPressed: isCanceling ? null :() { + (() async { + final confirmed = await showConfirmDialog( + context, + "Cancel Downloading", + "Do you confirm to cancel downloading for \"${widget.type} - ${widget.name}\"?" + ); + if (!confirmed) return false; + isCanceling = true; + await nodebase.instance.platform.downloadCancel(widget.filename); + return true; + })().then((ok) { + isCanceling = false; + if (!ok) return; generateSnackBar( context, "Canceled downloading for \"${widget.type} - ${widget.name}\"" From 609318baf16c7fc62fad9a80a6177fe22d335655 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:09:55 +0800 Subject: [PATCH 049/125] dart: platform - emit more info for downloading - emit "download", url, name --- lib/ctrl/platform.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 1d76294..f21f95f 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -128,15 +128,19 @@ class Platform { final signal = StreamController(); cancel ??= StreamController(); await fsGuaranteeDir(targetFilename); - event.platformToken.add([name, targetFilename, 0]); + event.platformToken.add(["download", name, url, targetFilename, 0]); final download = fsProgressDownload(targetFilename, url, signal, cancel); signal.stream.listen((message) { final progress = message[2]; + final len = message[1]; + final cur = message[0]; if (progress == -1) { // cancel or error - event.platformToken.add([name, targetFilename, -1]); + event.platformToken.add(["download", name, url, targetFilename, -1]); + } else if (len == 0) { + if (cur == 0) event.platformToken.add(["download", name, url, targetFilename, -99]); } else { - event.platformToken.add([name, targetFilename, progress]); + event.platformToken.add(["download", name, url, targetFilename, progress]); } }); return download; From 3cfb2ee48097aa66febd5c1044392228e7feaace Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:11:17 +0800 Subject: [PATCH 050/125] dart: event - change to broadcast --- lib/util/event.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/util/event.dart b/lib/util/event.dart index 151980b..70d1bcb 100755 --- a/lib/util/event.dart +++ b/lib/util/event.dart @@ -1,5 +1,4 @@ import 'dart:async'; -final initializeToken = StreamController(); -final platformToken = StreamController(); -final nodebaseToken = StreamController(); \ No newline at end of file +final initializeToken = StreamController.broadcast(); +final platformToken = StreamController.broadcast(); \ No newline at end of file From 101f5c6c4b206b4948e66512a9cc9aee5d68e89a Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:12:12 +0800 Subject: [PATCH 051/125] dart: PlatformTile - remove unused import --- lib/comp/PlatformTile.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index f742c59..cf80c45 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'dart:developer'; import 'package:flutter/material.dart'; From 84afd11fd8d7860aa6c393600e53866d662a096c Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:12:59 +0800 Subject: [PATCH 052/125] dart: DownloadTile - listen and show downloading progress --- lib/comp/DownloadTile.dart | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/comp/DownloadTile.dart b/lib/comp/DownloadTile.dart index 8780af7..a482633 100755 --- a/lib/comp/DownloadTile.dart +++ b/lib/comp/DownloadTile.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; import './util.dart'; import '../util/event.dart' as event; @@ -27,6 +29,8 @@ class _DownloadTileState extends State with TickerProviderStateMix double progressValue = 0.0; bool isCanceling = false; + late StreamSubscription progress; + void modeDeterminate(double value) => setState(() { isDeterminate = true; controller.stop(); @@ -35,7 +39,7 @@ class _DownloadTileState extends State with TickerProviderStateMix void modeNonDeterminate() => setState(() { isDeterminate = false; controller - ..forward(from: controller.value) + ..forward(from: 0) ..repeat(); }); @@ -49,10 +53,28 @@ class _DownloadTileState extends State with TickerProviderStateMix setState(() {}); }); controller.repeat(); + + progress = event.platformToken.stream.listen((msg) { + final T = msg[0]; + if (T != "download") return; + final F = msg[3]; + if (F != widget.filename) return; + final V = msg[4]; + if (V == -99) { + modeNonDeterminate(); + } else if (V == -1) { + setState(() { + isCanceling = true; + }); + } else { + modeDeterminate(V + 0.0); + } + }); } @override void dispose() { + progress.cancel(); controller.dispose(); super.dispose(); } From 23d1e078b0e284fbf82c29025f15a17f9da62e66 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:14:56 +0800 Subject: [PATCH 053/125] dart: init primary page - list apps and platforms - basic ops for app (except run app) and platform - show download progress --- lib/page/primay.dart | 238 +++++++++++++++++++++++++++++++++++++++++++ lib/page/splash.dart | 9 +- 2 files changed, 246 insertions(+), 1 deletion(-) create mode 100755 lib/page/primay.dart diff --git a/lib/page/primay.dart b/lib/page/primay.dart new file mode 100755 index 0000000..4493808 --- /dev/null +++ b/lib/page/primay.dart @@ -0,0 +1,238 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import '../util/event.dart' as event; +import '../ctrl/nodebase.dart' as nodebase; +import '../comp/AppRuntimeTile.dart'; +import '../comp/DownloadTile.dart'; +import '../comp/AppTile.dart'; +import '../comp/PlatformTile.dart'; + +class PrimaryPage extends StatefulWidget { + const PrimaryPage({super.key}); + + @override + State createState() => _PrimaryPageState(); +} + +class _PrimaryPageState extends State { + List runtimeList = []; + List downloadList = []; + List appList = []; + List plmList = []; + + late StreamSubscription downloadProgress; + + @override + void initState() { + super.initState(); + + downloadProgress = event.platformToken.stream.listen((msg) { + final T = msg[0]; + if (T != "download") return; + final tnv = msg[1]; + if (tnv is! String) return; + if (!tnv.endsWith(".bin")) return; + final parts = tnv.substring(0, tnv.length - 4).split("-"); + // TODO: check parts.length + print(parts); + final type = parts[0] == "app" ? "application" : "platform"; + final name = "${parts[1]}-${parts[2]}"; + final url = msg[2]; + final filename = msg[3]; + final val = msg[4]; + try { + final mark = downloadList.firstWhere( + (one) => one.type == type && + one.name == name && + one.url == url && + one.filename == filename, + ); + if (val >= 1) { + final i = downloadList.indexOf(mark); + if (i >= 0) { + setState(() { + downloadList.removeAt(i); + }); + } + } + } catch (e) { + if (val >= 0 && val < 1) { + setState(() { + downloadList.add(DownloadTile(name: name, type: type, url: url, filename: filename)); + }); + } + } + + }); + + initPlatformList(); + initApplicationList(); + } + + @override + void dispose() { + downloadProgress.cancel(); + super.dispose(); + } + + void initPlatformList() { + (() async { + final platform = nodebase.instance.platform; + return await Future.wait([ + platform.listAvailablePlatformList(), + platform.listInstalledPlatformList(), + ]); + })().then((list) { + final [listAp, listIp] = list; + final List r = []; + listAp.forEach((name, versions) { + for (final version in versions) { + final installed = listIp.containsKey(name) && listIp[name]!.contains(version); + final p = PlatformTile(name: name, version: version, defaultInstalled: installed); + r.add(p); + } + }); + setState(() { + plmList.clear(); + plmList.addAll(r); + }); + }); + } + + void initApplicationList() { + (() async { + final platform = nodebase.instance.platform; + return await Future.wait([ + platform.listAvailableApplicationList(), + platform.listInstalledApplicationList(), + ]); + })().then((list) { + final [listAa, listIa] = list; + final List r = []; + listAa.forEach((name, vps) { + for (final vp in vps) { + final i = vp.indexOf(':'); + final version = vp.substring(0, i); + final platform = vp.substring(i+1); + final installed = listIa.containsKey(name) && listIa[name]!.contains(vp); + final a = AppTile(name: name, version: version, defaultInstalled: installed, platform: platform); + r.add(a); + } + }); + setState(() { + appList.clear(); + appList.addAll(r); + }); + }); + } + + @override + Widget build(BuildContext context) { + final runningApps = nodebase.instance.application.getRunningApp(); + final List runningView = [ + const Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Wrap( + spacing: 2, + children: [ + Text(" "), + Icon(Icons.directions_run), + Text(" Running"), + ], + ), + ], + ), + ]; + if (runningApps.isNotEmpty) { + runningView.add( + ListView.builder( + itemCount: runningApps.length, + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) => + AppRuntimeTile(process: runningApps[index]) + ), + ); + } + if (downloadList.isNotEmpty) { + runningView.add( + ListView.builder( + itemCount: downloadList.length, + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) => downloadList[index] + ), + ); + } + final List appView = [ + const Divider(), + const Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Wrap( + spacing: 2, + children: [ + Text(" "), + Icon(Icons.extension_rounded), + Text(" Application"), + ], + ), + ], + ), + ]; + if (appList.isNotEmpty) { + appView.add( + ListView.builder( + itemCount: appList.length, + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) => appList[index] + ), + ); + } + final List plmView = [ + const Divider(), + const Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Wrap( + spacing: 2, + children: [ + Text(" "), + Icon(Icons.apps), + Text(" Platform"), + ], + ), + ], + ), + ]; + if (plmList.isNotEmpty) { + plmView.add( + ListView.builder( + itemCount: plmList.length, + shrinkWrap: true, + itemBuilder: (BuildContext context, int index) => plmList[index] + ), + ); + } + return Scaffold( + appBar: AppBar( + // TRY THIS: Try changing the color here to a specific color (to + // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar + // change color while the other colors stay the same. + backgroundColor: Theme.of(context).colorScheme.inversePrimary, + // Here we take the value from the MyHomePage object that was created by + // the App.build method, and use it to set our appbar title. + title: const Text("NodeBase"), + ), + body: SingleChildScrollView( + child: Column( + children: [ + ...runningView, + ...appView, + ...plmView, + ], + ), + ), + ); + } +} \ No newline at end of file diff --git a/lib/page/splash.dart b/lib/page/splash.dart index 034aed9..841e6e3 100755 --- a/lib/page/splash.dart +++ b/lib/page/splash.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:nodebase/page/notSupported.dart'; +import 'package:nodebase/page/primay.dart'; import '../util/event.dart' as event; import '../ctrl/nodebase.dart' as nodebase; @@ -26,7 +27,13 @@ class _SplashPageState extends State { } }); splashWait().then((_) { - if (!nodebase.instance.isSupported) { + if (nodebase.instance.isSupported) { + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute(builder: (context) => const PrimaryPage()), + (Route route) => false, + ); + } else { Navigator.pushAndRemoveUntil( context, MaterialPageRoute(builder: (context) => const NotSupportedPage()), From b20dcb028a3c4807e24bf677b8c24215362c4b69 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 12:23:34 +0800 Subject: [PATCH 054/125] dart: primary page - refact code for better reading --- lib/page/primay.dart | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 4493808..2e8aa68 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -126,9 +126,8 @@ class _PrimaryPageState extends State { }); }); } - - @override - Widget build(BuildContext context) { + + List buildRunningView(BuildContext context) { final runningApps = nodebase.instance.application.getRunningApp(); final List runningView = [ const Row( @@ -164,6 +163,10 @@ class _PrimaryPageState extends State { ), ); } + return runningView; + } + + List buildApplicationView(BuildContext context) { final List appView = [ const Divider(), const Row( @@ -189,6 +192,10 @@ class _PrimaryPageState extends State { ), ); } + return appView; + } + + List buildPlatformView(BuildContext context) { final List plmView = [ const Divider(), const Row( @@ -214,6 +221,11 @@ class _PrimaryPageState extends State { ), ); } + return plmView; + } + + @override + Widget build(BuildContext context) { return Scaffold( appBar: AppBar( // TRY THIS: Try changing the color here to a specific color (to @@ -227,9 +239,9 @@ class _PrimaryPageState extends State { body: SingleChildScrollView( child: Column( children: [ - ...runningView, - ...appView, - ...plmView, + ...buildRunningView(context), + ...buildApplicationView(context), + ...buildPlatformView(context), ], ), ), From d5199d2b95c338b31b633a8eb01ece4cad703810 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 20:52:38 +0800 Subject: [PATCH 055/125] dart: platform - add api to get app/platform base dir --- lib/ctrl/platform.dart | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index f21f95f..74f16e7 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -109,6 +109,13 @@ class Platform { return config.containsKey("platform-$os-$arch"); } + Future getApplicationBaseDir(String name, String version) async { + return path.join(_getApplicationBaseDir(), await fsCalcStringHash("$name-$version")); + } + Future getPlatformBaseDir(String name, String version) async { + return path.join(_getPlatformBaseDir(), await fsCalcStringHash("$name-$version")); + } + Future> readNodeBaseJson() async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "nodebase.json")); Future> readApplicationListJson() async => @@ -467,4 +474,4 @@ class Platform { // ref: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry await dir.delete(recursive: true); } -} \ No newline at end of file +} From ed6b0a1f3f076b37aff08b52e7a3da4a2648d97e Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 8 Feb 2024 20:53:19 +0800 Subject: [PATCH 056/125] dart: DownloadTile - add TODO comment for advanced cancel --- lib/comp/DownloadTile.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/comp/DownloadTile.dart b/lib/comp/DownloadTile.dart index a482633..619c1f0 100755 --- a/lib/comp/DownloadTile.dart +++ b/lib/comp/DownloadTile.dart @@ -118,6 +118,8 @@ class _DownloadTileState extends State with TickerProviderStateMix if (!confirmed) return false; isCanceling = true; await nodebase.instance.platform.downloadCancel(widget.filename); + // TODO: deal with if no network downloading + // event.platformToken.add(["download", widget.name, widget.url, widget.filename, -1]); return true; })().then((ok) { isCanceling = false; From 5e349770efeb922aa0c6018c856265bee2b46fa3 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 13 Feb 2024 22:12:05 +0800 Subject: [PATCH 057/125] dart: application api - return ApplicationProcess - after call start node process, return ApplicationProcess instead of null --- lib/ctrl/application.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ctrl/application.dart b/lib/ctrl/application.dart index 5a817a1..5319b18 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application.dart @@ -59,12 +59,13 @@ class Application { }); } - void startProcess(String name, List cmd, Map env) { + ApplicationProcess startProcess(String name, List cmd, Map env) { final app = ApplicationProcess(name: name, cmd: cmd, env: env); // XXX: if we want sandbox to run applications, // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl // on Linux, Android, consider proot app.start(); + return app; } void stopProcess(String name) { From c02af9248a3c13f444df82cc0e9d43e23f12ecfe Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 13 Feb 2024 22:13:05 +0800 Subject: [PATCH 058/125] dart: hide download progress when cancel or error --- lib/page/primay.dart | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 2e8aa68..1930642 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -43,9 +43,7 @@ class _PrimaryPageState extends State { final val = msg[4]; try { final mark = downloadList.firstWhere( - (one) => one.type == type && - one.name == name && - one.url == url && + (one) => one.url == url && one.filename == filename, ); if (val >= 1) { @@ -55,6 +53,14 @@ class _PrimaryPageState extends State { downloadList.removeAt(i); }); } + } else if (val == -1) { + // cancel or error + final i = downloadList.indexOf(mark); + if (i >= 0) { + setState(() { + downloadList.removeAt(i); + }); + } } } catch (e) { if (val >= 0 && val < 1) { From e8bffdf8fe19ddbf33f00255835c405856d68817 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 14 Feb 2024 01:36:33 +0800 Subject: [PATCH 059/125] dart: init run app steps - runAppInit to read default config - saveAppConfig to write used config - basic flow: - runAppStepCheckPlatform - runAppStepArgAndEnv - runAppStepReview --- lib/comp/runAppSteps.dart | 88 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100755 lib/comp/runAppSteps.dart diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart new file mode 100755 index 0000000..7892dba --- /dev/null +++ b/lib/comp/runAppSteps.dart @@ -0,0 +1,88 @@ +import 'package:flutter/material.dart'; +import 'package:nodebase/ctrl/application.dart'; +import '../ctrl/nodebase.dart' as nodebase; + +Future> runAppInit(BuildContext context, Map config) async { + final name = config["name"] ?? ""; + final version = config["version"] ?? ""; + final platform = config["platform"] ?? ""; + config["ready"] = false; + if (name == "" || version == "" || platform == "") return config; + config["base"] = await nodebase.instance.platform.getApplicationBaseDir(name, version); + // meta.entryPoint[0] + final meta = await nodebase.instance.platform.readApplicationMetaJson(name, version); + config["availableEntryPoint"] = meta["entryPoint"] ?? []; + config["argRequire"] = meta["argRequire"] ?? []; + config["envRequire"] = meta["envRequire"] ?? []; + // savedConfig.arg, savedConfig.env + final savedConfig = await nodebase.instance.platform.readApplicationConfig(name, version); + config["lastArg"] = savedConfig["arg"] ?? []; + config["lastEnv"] = savedConfig["env"] ?? {}; + config["lastEntryPoint"] = savedConfig["entryPoint"]; + config["lastExec"] = savedConfig["exec"]; + config["lastPlatformVersion"] = savedConfig["platformVersion"]; + // installed: {name: [version,...]} + final installed = await nodebase.instance.platform.listInstalledPlatformList(); + config["platformList"] = {}; + config["platformList"][platform] = installed[platform]; + config["ready"] = true; + return config; +} + +Future> runAppStepCheckPlatform(BuildContext context, Map config) async { + final name = config["name"]; + final version = config["version"]; + final platform = config["platform"]; + if (config["platformList"][platform] == null) { + // no install, check available and guide to download + await downloadPlatform(context, config); + config["platformReady"] = false; + } else { + // by default select last one, guide user to select platform version + config = await selectPlatform(context, config); + config["platformReady"] = true; + } + return config; +} +Future downloadPlatform(BuildContext context, Map config) async { +} +Future> selectPlatform(BuildContext context, Map config) async { + // TODO: show available; when select one, show available exec + return config; +} + +Future> runAppStepArgAndEnv(BuildContext context, Map config) async { + final name = config["name"]; + final version = config["version"]; + final platform = config["platform"]; + // TODO: show component to edit arg (List) and env(Map) + return config; +} + +Future runAppStepReview(BuildContext context, Map config) async { + final name = config["name"]; + final version = config["version"]; + final platform = config["platform"]; + final arg = config["arg"] ?? []; + final env = config["env"] ?? {}; + final entryPoint = config["entryPoint"]; // should not null + final exec = config["exec"]; // should not null + // TODO: mark platform is running + final app = nodebase.instance.application.startProcess( + "$name-$version", [exec, entryPoint, ...arg], env + ); + return app; +} + +Future saveAppConfig(Map config) async { + final name = config["name"]; + final version = config["version"]; + Map json = {}; + json["arg"] = config["arg"]; + json["env"] = config["env"]; + json["entryPoint"] = config["entryPoint"]; + json["exec"] = config["exec"]; + json["platform"] = config["platform"]; + json["platformVersion"] = config["platformVersion"]; + await nodebase.instance.platform.writeApplicationConfig(name, version, json); +} \ No newline at end of file From 438c20fc3d43c67bac97b9007a84d207bc88c885 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 14 Feb 2024 01:45:00 +0800 Subject: [PATCH 060/125] dart: runAppSteps - add comment for platform download step --- lib/comp/runAppSteps.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 7892dba..7204e18 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -45,6 +45,7 @@ Future> runAppStepCheckPlatform(BuildContext context, Map downloadPlatform(BuildContext context, Map config) async { + // TODO: show all; click one download and stop app running } Future> selectPlatform(BuildContext context, Map config) async { // TODO: show available; when select one, show available exec From fee30452c3b4d9bb5c25acdbae8413118c30ab64 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 14 Feb 2024 03:14:15 +0800 Subject: [PATCH 061/125] dart: runAppSteps - init select platform --- lib/comp/runAppSteps.dart | 97 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 7204e18..2e8a873 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -1,5 +1,8 @@ +import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:nodebase/ctrl/application.dart'; +import 'package:path/path.dart' as path; + +import '../ctrl/application.dart'; import '../ctrl/nodebase.dart' as nodebase; Future> runAppInit(BuildContext context, Map config) async { @@ -47,8 +50,98 @@ Future> runAppStepCheckPlatform(BuildContext context, Map downloadPlatform(BuildContext context, Map config) async { // TODO: show all; click one download and stop app running } +Future> getPlatformExec(String name, String version) async { + Map meta = await nodebase.instance.platform.readPlatformMetaJson(name, version); + List r = []; + for (final one in meta["executable"]) { + r.add(one); + } + return r; +} Future> selectPlatform(BuildContext context, Map config) async { - // TODO: show available; when select one, show available exec + final Completer ok = Completer(); + final platform = config["platform"]; + final platformList = config["platformList"][platform]; + final List> dropdownItems = [ + const DropdownMenuItem(value: "-", child: Text("(not selected)")), + ]; + for (final value in platformList) { + dropdownItems.add(DropdownMenuItem(value: value, child: Text(value))); + } + String selected = "-"; + String selectedExec = "-"; + List execs = []; + showDialog(context: context, builder: (context) { + return StatefulBuilder( + builder: (context, setState) { + return AlertDialog( + title: const Text("Select Platform"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text("Platform: $platform"), + DropdownButton( + value: selected, + items: dropdownItems, + onChanged: (val) { + if (val == null) return; + selected = val; + if (val == "-") { + execs = []; + setState(() {}); + return; + } + getPlatformExec(platform, selected).then((list) { + execs = list; + setState(() {}); + }); + }, + ), + ...(selected == "-" ? [] : [ + const Text("Exec"), + DropdownButton(items: [ + const DropdownMenuItem(value: "-", child: Text("(not selected)")), + ...execs.map((name) => DropdownMenuItem( + value: name, + child: Text(path.basename(name), overflow: TextOverflow.ellipsis), + )).toList() + ], onChanged: (val) { + if (val == null) return; + selectedExec = val; + setState(() {}); + }, value: selectedExec), + ]), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text("Cancel")), + ElevatedButton( + onPressed: selected == "-" || selectedExec == "-" ? null : () { + Navigator.of(context).pop(); + ok.complete(); + }, + child: const Text("Next")), + ], + ); + } + ); + } + ); + await ok.future; + config["platformVersion"] = selected; + config["exec"] = path.join( + await nodebase.instance.platform.getPlatformBaseDir(platform, selected), + selectedExec + ); return config; } From 6d65a6cfe3cf582a6095ddb2f48f1907be4794d8 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 14 Feb 2024 03:31:42 +0800 Subject: [PATCH 062/125] dart: runAppSteps - init config arg and env --- lib/comp/runAppSteps.dart | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 2e8a873..bad600a 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -146,10 +146,75 @@ Future> selectPlatform(BuildContext context, Map> runAppStepArgAndEnv(BuildContext context, Map config) async { + final Completer ok = Completer(); final name = config["name"]; final version = config["version"]; final platform = config["platform"]; // TODO: show component to edit arg (List) and env(Map) + final availableEntryPoint = config["availableEntryPoint"]; + final List> dropdownItems = [ + const DropdownMenuItem(value: "-", child: Text("(not selected)")), + ]; + for (final value in availableEntryPoint) { + dropdownItems.add(DropdownMenuItem(value: value, child: Text(value))); + } + String selected = "-"; + List arg = []; + Map env = {}; + showDialog(context: context, builder: (context) { + return StatefulBuilder( + builder: (context, setState) { + return AlertDialog( + title: const Text("Config Application"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + const Text("Entrypoint"), + DropdownButton( + value: selected, + items: dropdownItems, + onChanged: (val) { + if (val == null) return; + selected = val; + setState(() {}); + }, + ), + ...(selected == "-" ? []: [ + const Text("Arg"), + // TODO: arg list + const Text("Env"), + // TODO: env + ]), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text("Cancel")), + ElevatedButton( + onPressed: selected == "-" ? null : () { + Navigator.of(context).pop(); + ok.complete(); + }, + child: const Text("Next")), + ], + ); + }); + }); + await ok.future; + config["entryPoint"] = path.join( + await nodebase.instance.platform.getApplicationBaseDir(name, version), + selected + ); + config["arg"] = arg; + config["env"] = env; return config; } From 555454faeca2df6c54906d9c06cfcc92763aadfe Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Wed, 14 Feb 2024 23:38:11 +0800 Subject: [PATCH 063/125] dart: runAppSteps - init application start process - 1 select a platform - 2 select platform version - 3 select entry point - 4 fill arg and env - 5 run (TODO: review) --- lib/comp/runAppSteps.dart | 214 +++++++++++++++++++++++++++++++++++++- 1 file changed, 209 insertions(+), 5 deletions(-) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index bad600a..1d08c9d 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -5,6 +5,81 @@ import 'package:path/path.dart' as path; import '../ctrl/application.dart'; import '../ctrl/nodebase.dart' as nodebase; +const defaultHintStyle = TextStyle(color: Color.fromARGB(128, 0, 0, 0)); + +class ArgInput extends StatelessWidget { + const ArgInput({ + super.key, + required this.onDelete, + required this.onChanged, + required this.placeholder, + }); + + final String placeholder; + final void Function(ArgInput)? onDelete; + final void Function(ArgInput, String)? onChanged; + + @override + Widget build(BuildContext context) { + return Row( + textDirection: TextDirection.rtl, + children: [ + IconButton( + onPressed: onDelete == null ? null : () => onDelete!(this), + icon: const Icon(Icons.close) + ), + Expanded(child: TextField( + onChanged: onChanged == null ? null : (val) => onChanged!(this, val), + decoration: InputDecoration( + hintText: placeholder, + hintStyle: defaultHintStyle + ), + )), + ], + ); + } + +} + +class EnvInput extends StatelessWidget { + const EnvInput({ + super.key, + required this.onDelete, + required this.onKeyChanged, + required this.onValChanged, + required this.placeholder, + }); + + final String placeholder; + final void Function(EnvInput)? onDelete; + final void Function(EnvInput, String)? onKeyChanged; + final void Function(EnvInput, String)? onValChanged; + + @override + Widget build(BuildContext context) { + return Row( + textDirection: TextDirection.rtl, + children: [ + IconButton( + onPressed: onDelete == null ? null : () => onDelete!(this), + icon: const Icon(Icons.close) + ), + Expanded(child: TextField( + onChanged: onValChanged == null ? null : (val) => onValChanged!(this, val), + decoration: InputDecoration( + hintText: placeholder, + hintStyle: defaultHintStyle + ), + )), + Expanded(child: TextField( + onChanged: onKeyChanged == null ? null : (val) => onKeyChanged!(this, val), + )), + ], + ); + } + +} + Future> runAppInit(BuildContext context, Map config) async { final name = config["name"] ?? ""; final version = config["version"] ?? ""; @@ -19,8 +94,62 @@ Future> runAppInit(BuildContext context, Map= n) { + final one = config["argRequire"][i]; + config["lastArg"].add({ + "help": one["help"] ?? "", + "default": one["default"] ?? "", + "last": null, + "required": one["required"] ?? true, + }); + } else { + config["lastArg"].add({ + "help": "", + "default": "", + "last": lastArg[i], + "required": false, + }); + } + } + + final lastEnv = savedConfig["env"] ?? {}; + config["lastEnv"] = {}; + for(int i = 0, n = config["envRequire"].length; i < n; i++) { + final one = config["envRequire"][i]; + final name = one["name"]; + config["lastEnv"][name] = { + "name": name, + "help": one["help"] ?? "", + "default": one["default"], + "last": lastEnv[name] ?? "", + "required": one["required"] ?? false, + }; + } + for(final k in lastEnv.keys) { + final one = config["lastEnv"][k]; + if (one == null) { + config["lastEnv"][k] = { + "name": k, + "help": "", + "default": "", + "last": lastEnv[k], + "required": false, + }; + } + } + config["lastEntryPoint"] = savedConfig["entryPoint"]; config["lastExec"] = savedConfig["exec"]; config["lastPlatformVersion"] = savedConfig["platformVersion"]; @@ -145,6 +274,33 @@ Future> selectPlatform(BuildContext context, Map argItems, List arg, dynamic one, Function setState) { + return ArgInput(onDelete: (self) { + final i = argItems.indexOf(self); + argItems.removeAt(i); + arg.removeAt(i); + setState(() {}); + }, onChanged: (self, val) { + final i = argItems.indexOf(self); + arg[i] = val; + }, placeholder: one["help"] ?? ""); +} +EnvInput generateEnvInput(List envItems, List envk, List envv, dynamic one, Function setState) { + return EnvInput(onDelete: (self) { + final i = envItems.indexOf(self); + envItems.removeAt(i); + envk.removeAt(i); + envv.removeAt(i); + setState(() {}); + }, onKeyChanged: (self, val) { + final i = envItems.indexOf(self); + envk[i] = val; + }, onValChanged: (self, val) { + final i = envItems.indexOf(self); + envv[i] = val; + }, placeholder: one["help"] ?? ""); +} + Future> runAppStepArgAndEnv(BuildContext context, Map config) async { final Completer ok = Completer(); final name = config["name"]; @@ -160,10 +316,36 @@ Future> runAppStepArgAndEnv(BuildContext context, Map arg = []; - Map env = {}; + List envk = []; + List envv = []; + final List argItems = []; + final List envItems = []; + for (final _ in config["lastArg"]) { + argItems.add(null); + arg.add(""); + } + for (final _ in config["lastEnv"].values) { + envItems.add(null); + } + showDialog(context: context, builder: (context) { return StatefulBuilder( builder: (context, setState) { + int i = 0; + for (final one in config["lastArg"]) { + if (i >= argItems.length) break; + argItems[i] = generateArgInput(argItems, arg, one, setState); + arg[i] = one["last"] ?? one["default"] ?? ""; + i ++; + } + i = 0; + for (final one in config["lastEnv"].values) { + if (i >= envItems.length) break; + envItems[i] = generateEnvInput(envItems, envk, envv, one, setState); + envv[i] = one["name"] ?? ""; + envk[i] = one["last"] ?? one["default"] ?? ""; + i ++; + } return AlertDialog( title: const Text("Config Application"), shape: const BeveledRectangleBorder(), @@ -186,9 +368,22 @@ Future> runAppStepArgAndEnv(BuildContext context, Map> runAppStepArgAndEnv(BuildContext context, Map env = {}; + for (int i = 0, n = envk.length; i < n; i++) { + final k = envk[i]; + final v = envv[i]; + if (k == "" || v == "") continue; + env[k] = v; + } config["env"] = env; return config; } From 1486353bc520c7ba47b4129300b1d78eb1b03a56 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 15 Feb 2024 11:22:07 +0800 Subject: [PATCH 064/125] dart: runAppSteps - add review step for app run --- lib/comp/runAppSteps.dart | 72 ++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 1d08c9d..f7e2ef9 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -12,10 +12,12 @@ class ArgInput extends StatelessWidget { super.key, required this.onDelete, required this.onChanged, - required this.placeholder, + this.placeholder = "", + this.initialValue = "", }); final String placeholder; + final String initialValue; final void Function(ArgInput)? onDelete; final void Function(ArgInput, String)? onChanged; @@ -28,7 +30,8 @@ class ArgInput extends StatelessWidget { onPressed: onDelete == null ? null : () => onDelete!(this), icon: const Icon(Icons.close) ), - Expanded(child: TextField( + Expanded(child: TextFormField( + initialValue: initialValue, onChanged: onChanged == null ? null : (val) => onChanged!(this, val), decoration: InputDecoration( hintText: placeholder, @@ -47,10 +50,14 @@ class EnvInput extends StatelessWidget { required this.onDelete, required this.onKeyChanged, required this.onValChanged, - required this.placeholder, + this.placeholder = "", + this.initialKeyValue = "", + this.initialValValue = "", }); final String placeholder; + final String initialKeyValue; + final String initialValValue; final void Function(EnvInput)? onDelete; final void Function(EnvInput, String)? onKeyChanged; final void Function(EnvInput, String)? onValChanged; @@ -64,14 +71,16 @@ class EnvInput extends StatelessWidget { onPressed: onDelete == null ? null : () => onDelete!(this), icon: const Icon(Icons.close) ), - Expanded(child: TextField( + Expanded(child: TextFormField( + initialValue: initialValValue, onChanged: onValChanged == null ? null : (val) => onValChanged!(this, val), decoration: InputDecoration( hintText: placeholder, hintStyle: defaultHintStyle ), )), - Expanded(child: TextField( + Expanded(child: TextFormField( + initialValue: initialKeyValue, onChanged: onKeyChanged == null ? null : (val) => onKeyChanged!(this, val), )), ], @@ -238,7 +247,7 @@ Future> selectPlatform(BuildContext context, Map DropdownMenuItem( value: name, child: Text(path.basename(name), overflow: TextOverflow.ellipsis), - )).toList() + )) ], onChanged: (val) { if (val == null) return; selectedExec = val; @@ -283,7 +292,7 @@ ArgInput generateArgInput(List argItems, List arg, dynamic one, }, onChanged: (self, val) { final i = argItems.indexOf(self); arg[i] = val; - }, placeholder: one["help"] ?? ""); + }, placeholder: one["help"] ?? "", initialValue: one["last"] ?? one["default"] ?? ""); } EnvInput generateEnvInput(List envItems, List envk, List envv, dynamic one, Function setState) { return EnvInput(onDelete: (self) { @@ -298,7 +307,10 @@ EnvInput generateEnvInput(List envItems, List envk, List> runAppStepArgAndEnv(BuildContext context, Map config) async { @@ -422,14 +434,56 @@ Future> runAppStepArgAndEnv(BuildContext context, Map runAppStepReview(BuildContext context, Map config) async { +Future runAppStepReview(BuildContext context, Map config) async { + final ok = Completer(); final name = config["name"]; final version = config["version"]; final platform = config["platform"]; + final platformVersion = config["platformVersion"]; final arg = config["arg"] ?? []; final env = config["env"] ?? {}; final entryPoint = config["entryPoint"]; // should not null final exec = config["exec"]; // should not null + + showDialog(context: context, builder: (_) => AlertDialog( + title: const Text("Application Info"), + shape: const BeveledRectangleBorder(), + content: SizedBox( + height: 200, + width: 300, + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + SelectableText("-- Application --\n" + "$name-$version\n\\-> ${path.basename(entryPoint)}\n\n" + "-- Platform --\n$platform-$platformVersion\n\\-> ${path.basename(exec)}\n\n" + "-- Config --\n" + "-> Arg\n${arg.isEmpty ? "(empty)" : arg.join("\n")}\n" + "-> Env\n${env.isEmpty ? "(empty)" : env.entries.map( + (item) => "${item.key} = ${item.value}").toList().join("\n")}" + ), + ], + ), + ), + ), + actions: [ + TextButton( + onPressed: () { + Navigator.of(context).pop(); + ok.complete(false); + }, + child: const Text("Cancel")), + ElevatedButton( + onPressed: () { + Navigator.of(context).pop(); + ok.complete(true); + }, + child: const Text("Run")), + ], + )); + final r = await ok.future; + if (!r) return null; // TODO: mark platform is running final app = nodebase.instance.application.startProcess( "$name-$version", [exec, entryPoint, ...arg], env From 4590c9bc6be397ba52cccbffd734635a931b62c2 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 15 Feb 2024 21:31:08 +0800 Subject: [PATCH 065/125] dart: primary/AppTile - init start function - runAppSteps: basic start workflow (except download workflow) - AppTile: start button function - AppRuntimeTile: stop button function - primary: show running application list --- lib/comp/AppTile.dart | 17 ++++++++++++++++- lib/comp/runAppSteps.dart | 4 +++- lib/ctrl/application.dart | 11 +++++++++-- lib/page/primay.dart | 37 +++++++++++++++++++++++++++++++------ 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index 5becce8..a67d6fb 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:flutter/material.dart'; +import './runAppSteps.dart'; import './util.dart'; import '../ctrl/nodebase.dart' as nodebase; @@ -63,7 +64,21 @@ class _AppTileState extends State { // list all available name - {versions} // TODO: pop up a dialog for exec, env set up // read exec, env from last run or default value - // TODO: start + Map config = { + "name": widget.name, + "version": widget.version, + "platform": widget.platform, + }; + runAppInit(context, config).then((_) { + runAppStepCheckPlatform(context, config).then((_) { + runAppStepArgAndEnv(context, config).then((_) { + runAppStepReview(context, config).then((_) { + // TODO: let the async return true or false so that we can check + // instead of here, if one is await forever, then memory leak + }); + }); + }); + }); }, icon: const Icon(Icons.play_arrow))); actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { // TODO: check if running, no remove diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index f7e2ef9..7d7985d 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -5,6 +5,8 @@ import 'package:path/path.dart' as path; import '../ctrl/application.dart'; import '../ctrl/nodebase.dart' as nodebase; +// TODO: rewrite all async, incomplete await causes memory leak + const defaultHintStyle = TextStyle(color: Color.fromARGB(128, 0, 0, 0)); class ArgInput extends StatelessWidget { @@ -486,7 +488,7 @@ Future runAppStepReview(BuildContext context, Map cmd, Map env) { - final app = ApplicationProcess(name: name, cmd: cmd, env: env); + ApplicationProcess startProcess( + String name, + String platform, + List cmd, + Map env + ) { + final app = ApplicationProcess(name: name, cmd: cmd, env: env, platform: platform); // XXX: if we want sandbox to run applications, // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl // on Linux, Android, consider proot app.start(); + runtime[name] = app; return app; } void stopProcess(String name) { final app = runtime[name]; if (app == null) return; + runtime.remove(name); app.stop(); } diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 1930642..5e8264d 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import '../util/api.dart'; import '../util/event.dart' as event; import '../ctrl/nodebase.dart' as nodebase; import '../comp/AppRuntimeTile.dart'; @@ -22,6 +23,7 @@ class _PrimaryPageState extends State { List plmList = []; late StreamSubscription downloadProgress; + late StreamSubscription applicationEvent; @override void initState() { @@ -35,7 +37,6 @@ class _PrimaryPageState extends State { if (!tnv.endsWith(".bin")) return; final parts = tnv.substring(0, tnv.length - 4).split("-"); // TODO: check parts.length - print(parts); final type = parts[0] == "app" ? "application" : "platform"; final name = "${parts[1]}-${parts[2]}"; final url = msg[2]; @@ -69,7 +70,32 @@ class _PrimaryPageState extends State { }); } } + }); + applicationEvent = NodeBaseApi.event.receiveBroadcastStream("app").listen((message) { + final cmd = message[0]; + final nameVersion = message[1]; + final app = nodebase.instance.application.getApp(nameVersion); + if (app == null) return; + AppRuntimeTile? tile; + try { + tile = runtimeList.firstWhere((one) => one.process == app); + } catch(err) { + tile = null; + } + switch(cmd) { + case "start": + if (tile != null) return; + runtimeList.add(AppRuntimeTile(process: app)); + setState(() {}); + break; + case "stop": + if (tile == null) return; + final i = runtimeList.indexOf(tile); + runtimeList.removeAt(i); + setState(() {}); + break; + } }); initPlatformList(); @@ -79,6 +105,7 @@ class _PrimaryPageState extends State { @override void dispose() { downloadProgress.cancel(); + applicationEvent.cancel(); super.dispose(); } @@ -134,7 +161,6 @@ class _PrimaryPageState extends State { } List buildRunningView(BuildContext context) { - final runningApps = nodebase.instance.application.getRunningApp(); final List runningView = [ const Row( mainAxisAlignment: MainAxisAlignment.start, @@ -150,13 +176,12 @@ class _PrimaryPageState extends State { ], ), ]; - if (runningApps.isNotEmpty) { + if (runtimeList.isNotEmpty) { runningView.add( ListView.builder( - itemCount: runningApps.length, + itemCount: runtimeList.length, shrinkWrap: true, - itemBuilder: (BuildContext context, int index) => - AppRuntimeTile(process: runningApps[index]) + itemBuilder: (BuildContext context, int index) => runtimeList[index] ), ); } From afa8436c496e0aa1968419214e92265d4e1c0d67 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 15 Feb 2024 22:37:15 +0800 Subject: [PATCH 066/125] dart: primary page - bugfix in case no app got when stop - we do not know if stop happens then entity removed in map first or stop event emitted first so that cannot guarantee we can get app entity - but AppRuntimeTile point to app entity so that we can use it to get the entity --- lib/page/primay.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 5e8264d..765739c 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -76,16 +76,15 @@ class _PrimaryPageState extends State { final cmd = message[0]; final nameVersion = message[1]; final app = nodebase.instance.application.getApp(nameVersion); - if (app == null) return; AppRuntimeTile? tile; try { - tile = runtimeList.firstWhere((one) => one.process == app); + tile = runtimeList.firstWhere((one) => one.process == app || one.process.name == nameVersion); } catch(err) { tile = null; } switch(cmd) { case "start": - if (tile != null) return; + if (app == null || tile != null) return; runtimeList.add(AppRuntimeTile(process: app)); setState(() {}); break; From 27e34f1fa2b80df8e7823d9032ade4568e7f4fc2 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 15 Feb 2024 22:39:13 +0800 Subject: [PATCH 067/125] android: bugfix cannot correctly stop running processes - typo: --ppid instead of --pid --- .../nodebase/nodebase/NodeAppMonitor.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java index 585e71e..52c9b22 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java @@ -70,7 +70,7 @@ private ArrayList nodebaseChildrenPids(int pid) { ArrayList children = new ArrayList<>(); String output = Command.checkOutput(new String[] { "/system/bin/ps", - "-o", "pid=", "--pid", String.valueOf(pid) + "-o", "pid=", "--ppid", String.valueOf(pid) }); if (output == null || output.length() == 0) return children; String[] lines = output.trim().split("\n"); @@ -208,27 +208,27 @@ public void run() { getId(), this.nodebaseName, e) ); // TODO event/onError - } finally { - this.nodebaseStat = STAT.DEAD; - // TODO: event/onPost - Logger.e( - "NodeService", - "monitor", - String.format( - Locale.getDefault(), - "stopped (%d / %s)", - getId(), this.nodebaseName) - ); - - uiRunner.post(new Runnable() { - @Override - public void run() { - ArrayList r = new ArrayList<>(); - r.add("stop"); - r.add(nodebaseName); - NodeAppService.getEventHandler().postMessage("app", r); - } - }); } + + this.nodebaseStat = STAT.DEAD; + // TODO: event/onPost + Logger.e( + "NodeService", + "monitor", + String.format( + Locale.getDefault(), + "stopped (%d / %s)", + getId(), this.nodebaseName) + ); + + uiRunner.post(new Runnable() { + @Override + public void run() { + ArrayList r = new ArrayList<>(); + r.add("stop"); + r.add(nodebaseName); + NodeAppService.getEventHandler().postMessage("app", r); + } + }); } } From c4bc781e865ee997858f9ab94c1ed0ea6bc0b19c Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 16 Feb 2024 22:17:02 +0800 Subject: [PATCH 068/125] update README --- README.md | 81 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index b685263..fedebb5 100755 --- a/README.md +++ b/README.md @@ -19,48 +19,57 @@ For previous mature version, please explore source code on ## How to use -- Platform/App market is online - - click into platform or application page - - click on the top-right cart icon button - - select what you want to download - - e.g. download platform `node-10.10.0` - - download app `file-transfer` - - edit app `file-transfer` platform value to `node-10.10.0` - - start `file-transfer` by clicking play icon button -- Create a new platform, for example named `node` - - fill node url like `file:///sdcard/bin-node-v10.10.0` or `https://example.com/latest/arm/node` - - click download button and wait for task complete - - (NodeBase will copy the binary to its app zone and make it executable) - - Wow; now we not only support node binary but also customized exectuables. -- Create a new app, for example named `test` and its platform is `node` - - click into the new app - - download an app zip into for example `/sdcard/test.zip` - - fill `Import / Export` text field with `/sdcard/test.zip` - - click upload button and wait for task complete - - (NodeBase will extract zip app as a app folder into app zone) - - fill `Params` text field (for example, file manager need to config target folder as first param) - - click `play` button to start node app - - click `open in browser` button to open the app in a webview / `pop-out` button to open in external browser - - click `stop` button to stop node app - -### App folder structure +- make sure your device can connect to Internet + - choose application for downloading (e.g. file\_transfer-1.0.0) + - choose platform for downloading (e.g. node-v10.10.0) +- application + - click `play` button to start app via a wizard + +### Market Structure ``` -//config.json +/nodebase.json +{ + "version": "...", + "platform--": "...", ... + "platform-windows-x64": "e.g." +} + +/plm--.json +{ + "items": [ + "-", ... + "node-v10.10.0" + ] +} + +/app--.json +{ + "items": [ + "-", ... + "app-1.0.0:node" + ] +} + +/plm///-))>.json { - "host": "http://127.0.0.1" - "port": 0, - "home": "/index.html", - "entry": "index.js" + "name": "e.g. node", + "version": "e.g. v20.10.0", + "source": ", e.g. https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-x64.zip", + "executable": ["", "e.g. node-v20.11.0-win-x64\\node.exe"] } -//static/index.html -[...] source code frontend client +/app///-))>.json +{ + "name": "e.g. file_transfer", + "version": "e.g. 1.0", + "source": ", e.g. https://raw.githubusercontent.com/wiki/dna2github/NodeBase/quick/app/node/file-transfer.zip", + "type": "web.server", + "argRequire": [{ "help": "folder path", "default": "." }], + "envRequire": [], + "entryPoint": ["index.js"] +} -//index.js -ref: https://github.com/stallpool/halfbase/tree/master/nodejs/tinyserver/index.js -[...] source code for backend server -[...] hook `/index.html` to load `/app/static/index.html` ``` App examples: [https://github.com/nodebase0](https://github.com/nodebase0), includes file-viewer-uploader, nodepad, ... From 5e696391d59f3e3d89de2c2ec4ed332ce570542d Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 16 Feb 2024 22:17:30 +0800 Subject: [PATCH 069/125] android: new add arm64 arch string for test device --- .../app/src/main/java/net/seven/nodebase/nodebase/External.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java b/android/app/src/main/java/net/seven/nodebase/nodebase/External.java index e796c43..fabcc37 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/External.java @@ -18,7 +18,7 @@ public static void openBrowser(Context context, String url) { private static String transformAbiToArch(String name) { switch(name) { - case "armeabi-v8a": return "arm64"; + case "armeabi-v8a": case "arm64-v8a": return "arm64"; case "x86_64": return "x64"; case "x86": return "x86"; case "armeabi-v7a": case "armeabi": return "arm"; From 972a15cbbb7efbe73e6719e66890fe40ed9791ed Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 12:02:49 +0800 Subject: [PATCH 070/125] android: exec disallowed after Android 10 - temporarily build at 28 (Android 9) --- android/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4a42cf3..068c3ae 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,7 +24,7 @@ if (flutterVersionName == null) { android { namespace "net.seven.nodebase.nodebase" - compileSdkVersion flutter.compileSdkVersion + compileSdk 33 ndkVersion flutter.ndkVersion compileOptions { @@ -37,8 +37,8 @@ android { applicationId "net.seven.nodebase.nodebase" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion + minSdkVersion 26 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } From a94cf0ecdac34f89a165a7629bdd44d7993930c0 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 12:03:56 +0800 Subject: [PATCH 071/125] dart: market - use github source instead of localhost --- lib/ctrl/nodebase.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 27605e3..12bf871 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -6,8 +6,8 @@ import '../util/fs.dart'; import '../util/api.dart'; import '../util/event.dart' as event; -//const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; -const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; +const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; +//const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; class NodeBaseController { late Application application; From e355d128bd0bba7eaa5132439de88255ed8f1449 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 15:25:37 +0800 Subject: [PATCH 072/125] android: ensure if all app exit, foreground service stops --- .../nodebase/ForegroundNodeService.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java b/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java index 23c7702..5b48b6d 100755 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java +++ b/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java @@ -15,6 +15,8 @@ public class ForegroundNodeService extends Service { private static final String CHANNEL_ID = "net.seven.nodebase.foregroundservice"; public static final String ARGV = "NodeService"; + private Thread watchDog; + public ForegroundNodeService() { } private void registerNotificationItem() { @@ -33,6 +35,27 @@ private void registerNotificationItem() { .setContentText("application nodebase service running ...") .build(); startForeground(1, notification); + + watchDog = new Thread(new Runnable() { + @Override + public void run() { + Intent it = new Intent( + ForegroundNodeService.this.getApplicationContext(), + ForegroundNodeService.class + ); + while(true) { + int count = NodeAppService.getRunningNodeAppCount(); + if (count <= 0) break; + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + break; + } + }; + ForegroundNodeService.this.stopService(it); + } + }); + watchDog.start(); } @Override From 563c9659b381634dc369d1f37a6762f2a2f708fd Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 20:55:23 +0800 Subject: [PATCH 073/125] dart: set splash page as entry point --- lib/main.dart | 99 ++++----------------------------------------------- 1 file changed, 6 insertions(+), 93 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 6e9b359..fbe025f 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,17 +1,18 @@ import 'package:flutter/material.dart'; +import './page/splash.dart'; void main() { - runApp(const MyApp()); + runApp(const NodeBaseApp()); } -class MyApp extends StatelessWidget { - const MyApp({super.key}); +class NodeBaseApp extends StatelessWidget { + const NodeBaseApp({super.key}); // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', + title: 'NodeBase', theme: ThemeData( // This is the theme of your application. // @@ -31,95 +32,7 @@ class MyApp extends StatelessWidget { colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), useMaterial3: true, ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), - ); - } -} - -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // TRY THIS: Try changing the color here to a specific color (to - // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar - // change color while the other colors stay the same. - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - // - // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" - // action in the IDE, or press "p" in the console), to see the - // wireframe for each widget. - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. + home: const SplashPage(), ); } } From 07039b0e27c3617de7acf949960d28f660f2cc84 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:12:46 +0800 Subject: [PATCH 074/125] dart: app start - ensure no memory leak - add await for showDialog() - each step, return bool instead of config - check step bool, if false, stop process --- lib/comp/AppTile.dart | 12 +++++---- lib/comp/runAppSteps.dart | 53 +++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index a67d6fb..5842d3b 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -69,12 +69,14 @@ class _AppTileState extends State { "version": widget.version, "platform": widget.platform, }; - runAppInit(context, config).then((_) { - runAppStepCheckPlatform(context, config).then((_) { - runAppStepArgAndEnv(context, config).then((_) { + runAppInit(context, config).then((ok0) { + if (!ok0) return; + runAppStepCheckPlatform(context, config).then((ok1) { + if (!ok1) return; + runAppStepArgAndEnv(context, config).then((ok2) { + if (!ok2) return; runAppStepReview(context, config).then((_) { - // TODO: let the async return true or false so that we can check - // instead of here, if one is await forever, then memory leak + // TODO: deal with ApplicationProcess object or null }); }); }); diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 7d7985d..8b77c80 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -5,8 +5,6 @@ import 'package:path/path.dart' as path; import '../ctrl/application.dart'; import '../ctrl/nodebase.dart' as nodebase; -// TODO: rewrite all async, incomplete await causes memory leak - const defaultHintStyle = TextStyle(color: Color.fromARGB(128, 0, 0, 0)); class ArgInput extends StatelessWidget { @@ -91,12 +89,12 @@ class EnvInput extends StatelessWidget { } -Future> runAppInit(BuildContext context, Map config) async { +Future runAppInit(BuildContext context, Map config) async { final name = config["name"] ?? ""; final version = config["version"] ?? ""; final platform = config["platform"] ?? ""; config["ready"] = false; - if (name == "" || version == "" || platform == "") return config; + if (name == "" || version == "" || platform == "") return false; config["base"] = await nodebase.instance.platform.getApplicationBaseDir(name, version); // meta.entryPoint[0] final meta = await nodebase.instance.platform.readApplicationMetaJson(name, version); @@ -169,10 +167,10 @@ Future> runAppInit(BuildContext context, Map> runAppStepCheckPlatform(BuildContext context, Map config) async { +Future runAppStepCheckPlatform(BuildContext context, Map config) async { final name = config["name"]; final version = config["version"]; final platform = config["platform"]; @@ -182,10 +180,9 @@ Future> runAppStepCheckPlatform(BuildContext context, Map downloadPlatform(BuildContext context, Map config) async { // TODO: show all; click one download and stop app running @@ -198,8 +195,7 @@ Future> getPlatformExec(String name, String version) async { } return r; } -Future> selectPlatform(BuildContext context, Map config) async { - final Completer ok = Completer(); +Future selectPlatform(BuildContext context, Map config) async { final platform = config["platform"]; final platformList = config["platformList"][platform]; final List> dropdownItems = [ @@ -211,7 +207,8 @@ Future> selectPlatform(BuildContext context, Map execs = []; - showDialog(context: context, builder: (context) { + bool ok = false; + await showDialog(context: context, builder: (context) { return StatefulBuilder( builder: (context, setState) { return AlertDialog( @@ -267,7 +264,7 @@ Future> selectPlatform(BuildContext context, Map> selectPlatform(BuildContext context, Map argItems, List arg, dynamic one, Function setState) { @@ -315,8 +312,7 @@ EnvInput generateEnvInput(List envItems, List envk, List> runAppStepArgAndEnv(BuildContext context, Map config) async { - final Completer ok = Completer(); +Future runAppStepArgAndEnv(BuildContext context, Map config) async { final name = config["name"]; final version = config["version"]; final platform = config["platform"]; @@ -332,6 +328,7 @@ Future> runAppStepArgAndEnv(BuildContext context, Map arg = []; List envk = []; List envv = []; + bool ok = false; final List argItems = []; final List envItems = []; for (final _ in config["lastArg"]) { @@ -342,7 +339,7 @@ Future> runAppStepArgAndEnv(BuildContext context, Map> runAppStepArgAndEnv(BuildContext context, Map> runAppStepArgAndEnv(BuildContext context, Map runAppStepReview(BuildContext context, Map config) async { - final ok = Completer(); final name = config["name"]; final version = config["version"]; final platform = config["platform"]; @@ -446,8 +442,9 @@ Future runAppStepReview(BuildContext context, Map AlertDialog( + await showDialog(context: context, builder: (_) => AlertDialog( title: const Text("Application Info"), shape: const BeveledRectangleBorder(), content: SizedBox( @@ -471,21 +468,17 @@ Future runAppStepReview(BuildContext context, Map Navigator.of(context).pop(), child: const Text("Cancel")), ElevatedButton( onPressed: () { Navigator.of(context).pop(); - ok.complete(true); + ok = true; }, child: const Text("Run")), ], )); - final r = await ok.future; - if (!r) return null; + if (!ok) return null; // TODO: mark platform is running final app = nodebase.instance.application.startProcess( "$name-$version", "$platform-$platformVersion", [exec, entryPoint, ...arg], env From b43352aa66924550068dc59de9e8ac448cfc285e Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:20:54 +0800 Subject: [PATCH 075/125] dart: runAppStep - remove unused state --- lib/comp/runAppSteps.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 8b77c80..8992981 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -93,7 +93,6 @@ Future runAppInit(BuildContext context, Map config) async final name = config["name"] ?? ""; final version = config["version"] ?? ""; final platform = config["platform"] ?? ""; - config["ready"] = false; if (name == "" || version == "" || platform == "") return false; config["base"] = await nodebase.instance.platform.getApplicationBaseDir(name, version); // meta.entryPoint[0] @@ -166,7 +165,6 @@ Future runAppInit(BuildContext context, Map config) async final installed = await nodebase.instance.platform.listInstalledPlatformList(); config["platformList"] = {}; config["platformList"][platform] = installed[platform]; - config["ready"] = true; return true; } @@ -177,7 +175,6 @@ Future runAppStepCheckPlatform(BuildContext context, Map if (config["platformList"][platform] == null) { // no install, check available and guide to download await downloadPlatform(context, config); - config["platformReady"] = false; } else { // by default select last one, guide user to select platform version return await selectPlatform(context, config); From 3d82d67277a4814939179ce560b1bc39764916f1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:21:56 +0800 Subject: [PATCH 076/125] dart: AppRuntimeTile - make tile color as const --- lib/comp/AppRuntimeTile.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/AppRuntimeTile.dart index a64f605..037b6f4 100755 --- a/lib/comp/AppRuntimeTile.dart +++ b/lib/comp/AppRuntimeTile.dart @@ -58,7 +58,7 @@ class _AppRuntimeTileState extends State { }, icon: const Icon(Icons.stop)), ], ), - tileColor: Color.fromARGB(255, 230, 255, 230), + tileColor: const Color.fromARGB(255, 230, 255, 230), ); } From 4c48174f8bfc0970157e8291924e6d6ee9b31752 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:39:29 +0800 Subject: [PATCH 077/125] dart: run app - memorize last selected - memorize last selected - platform version - platform exec - entry point - args - env --- lib/comp/AppTile.dart | 5 +++-- lib/comp/runAppSteps.dart | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index 5842d3b..60a624b 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -75,8 +75,9 @@ class _AppTileState extends State { if (!ok1) return; runAppStepArgAndEnv(context, config).then((ok2) { if (!ok2) return; - runAppStepReview(context, config).then((_) { - // TODO: deal with ApplicationProcess object or null + runAppStepReview(context, config).then((app) { + if (app == null) return; + saveAppConfig(config); }); }); }); diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 8992981..b0e6322 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -204,10 +204,26 @@ Future selectPlatform(BuildContext context, Map config) a String selected = "-"; String selectedExec = "-"; List execs = []; + bool firstTime = true; bool ok = false; await showDialog(context: context, builder: (context) { return StatefulBuilder( builder: (context, setState) { + if (firstTime && selected == "-" && config["lastPlatformVersion"] != null) { + firstTime = false; + final lastSelected = config["lastPlatformVersion"]; + final lastSelectedExec = config["lastExec"]; + if (config["platformList"][platform].contains(lastSelected)) { + getPlatformExec(platform, lastSelected).then((list) { + selected = lastSelected; + execs = list; + if (list.contains(lastSelectedExec)) { + selectedExec = lastSelectedExec; + } + setState(() {}); + }); + } + } return AlertDialog( title: const Text("Select Platform"), shape: const BeveledRectangleBorder(), @@ -272,6 +288,7 @@ Future selectPlatform(BuildContext context, Map config) a ); if (!ok) return false; config["platformVersion"] = selected; + config["selectedExec"] = selectedExec; config["exec"] = path.join( await nodebase.instance.platform.getPlatformBaseDir(platform, selected), selectedExec @@ -321,7 +338,7 @@ Future runAppStepArgAndEnv(BuildContext context, Map conf for (final value in availableEntryPoint) { dropdownItems.add(DropdownMenuItem(value: value, child: Text(value))); } - String selected = "-"; + String selected = config["lastEntryPoint"] ?? "-"; List arg = []; List envk = []; List envv = []; @@ -412,6 +429,7 @@ Future runAppStepArgAndEnv(BuildContext context, Map conf }); }); if (!ok) return false; + config["selectedEntryPoint"] = selected; config["entryPoint"] = path.join( await nodebase.instance.platform.getApplicationBaseDir(name, version), selected @@ -489,8 +507,8 @@ Future saveAppConfig(Map config) async { Map json = {}; json["arg"] = config["arg"]; json["env"] = config["env"]; - json["entryPoint"] = config["entryPoint"]; - json["exec"] = config["exec"]; + json["entryPoint"] = config["selectedEntryPoint"]; + json["exec"] = config["selectedExec"]; json["platform"] = config["platform"]; json["platformVersion"] = config["platformVersion"]; await nodebase.instance.platform.writeApplicationConfig(name, version, json); From cb6e3d8c6ce1ef218e964f9d134e5b57646b7165 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:44:49 +0800 Subject: [PATCH 078/125] dart: run app - show message for download platform version if no available one --- lib/comp/runAppSteps.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index b0e6322..1195048 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -4,6 +4,7 @@ import 'package:path/path.dart' as path; import '../ctrl/application.dart'; import '../ctrl/nodebase.dart' as nodebase; +import './util.dart'; const defaultHintStyle = TextStyle(color: Color.fromARGB(128, 0, 0, 0)); @@ -183,6 +184,8 @@ Future runAppStepCheckPlatform(BuildContext context, Map } Future downloadPlatform(BuildContext context, Map config) async { // TODO: show all; click one download and stop app running + final platform = config["platform"]; + generateSnackBar(context, "Dependency missing.\nNo available versions for \"$platform\"."); } Future> getPlatformExec(String name, String version) async { Map meta = await nodebase.instance.platform.readPlatformMetaJson(name, version); From 829b9585675d5e1b4839f9dafb9c1c6306c73962 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 21:53:21 +0800 Subject: [PATCH 079/125] dart: runAppSteps - hide remove button for required arg/env --- lib/comp/runAppSteps.dart | 65 +++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/lib/comp/runAppSteps.dart b/lib/comp/runAppSteps.dart index 1195048..dc54502 100755 --- a/lib/comp/runAppSteps.dart +++ b/lib/comp/runAppSteps.dart @@ -13,10 +13,12 @@ class ArgInput extends StatelessWidget { super.key, required this.onDelete, required this.onChanged, + this.required = false, this.placeholder = "", this.initialValue = "", }); + final bool required; final String placeholder; final String initialValue; final void Function(ArgInput)? onDelete; @@ -27,10 +29,10 @@ class ArgInput extends StatelessWidget { return Row( textDirection: TextDirection.rtl, children: [ - IconButton( + ...(required ? [] : [IconButton( onPressed: onDelete == null ? null : () => onDelete!(this), icon: const Icon(Icons.close) - ), + )]), Expanded(child: TextFormField( initialValue: initialValue, onChanged: onChanged == null ? null : (val) => onChanged!(this, val), @@ -51,11 +53,13 @@ class EnvInput extends StatelessWidget { required this.onDelete, required this.onKeyChanged, required this.onValChanged, + this.required = false, this.placeholder = "", this.initialKeyValue = "", this.initialValValue = "", }); + final bool required; final String placeholder; final String initialKeyValue; final String initialValValue; @@ -68,10 +72,10 @@ class EnvInput extends StatelessWidget { return Row( textDirection: TextDirection.rtl, children: [ - IconButton( + ...(required ? [] : [IconButton( onPressed: onDelete == null ? null : () => onDelete!(this), icon: const Icon(Icons.close) - ), + )]), Expanded(child: TextFormField( initialValue: initialValValue, onChanged: onValChanged == null ? null : (val) => onValChanged!(this, val), @@ -300,30 +304,38 @@ Future selectPlatform(BuildContext context, Map config) a } ArgInput generateArgInput(List argItems, List arg, dynamic one, Function setState) { - return ArgInput(onDelete: (self) { - final i = argItems.indexOf(self); - argItems.removeAt(i); - arg.removeAt(i); - setState(() {}); - }, onChanged: (self, val) { - final i = argItems.indexOf(self); - arg[i] = val; - }, placeholder: one["help"] ?? "", initialValue: one["last"] ?? one["default"] ?? ""); + return ArgInput( + onDelete: (self) { + final i = argItems.indexOf(self); + argItems.removeAt(i); + arg.removeAt(i); + setState(() {}); + }, onChanged: (self, val) { + final i = argItems.indexOf(self); + arg[i] = val; + }, + required: one["required"] ?? false, + placeholder: one["help"] ?? "", + initialValue: one["last"] ?? one["default"] ?? "" + ); } EnvInput generateEnvInput(List envItems, List envk, List envv, dynamic one, Function setState) { - return EnvInput(onDelete: (self) { - final i = envItems.indexOf(self); - envItems.removeAt(i); - envk.removeAt(i); - envv.removeAt(i); - setState(() {}); - }, onKeyChanged: (self, val) { - final i = envItems.indexOf(self); - envk[i] = val; - }, onValChanged: (self, val) { - final i = envItems.indexOf(self); - envv[i] = val; - }, placeholder: one["help"] ?? "", + return EnvInput( + onDelete: (self) { + final i = envItems.indexOf(self); + envItems.removeAt(i); + envk.removeAt(i); + envv.removeAt(i); + setState(() {}); + }, onKeyChanged: (self, val) { + final i = envItems.indexOf(self); + envk[i] = val; + }, onValChanged: (self, val) { + final i = envItems.indexOf(self); + envv[i] = val; + }, + required: one["required"] ?? false, + placeholder: one["help"] ?? "", initialKeyValue: one["name"] ?? "", initialValValue: one["last"] ?? one["default"] ?? "", ); @@ -431,6 +443,7 @@ Future runAppStepArgAndEnv(BuildContext context, Map conf ); }); }); + // TODO: check required arg, env if (!ok) return false; config["selectedEntryPoint"] = selected; config["entryPoint"] = path.join( From 75dec6ecabbd314f46bec0ee8dc690bbbfd35da7 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 22:06:18 +0800 Subject: [PATCH 080/125] dart: App/PlatformTile - can pass running state in constructor --- lib/comp/AppTile.dart | 3 +++ lib/comp/PlatformTile.dart | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index 60a624b..071e033 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -12,12 +12,14 @@ class AppTile extends StatefulWidget { required this.version, required this.platform, this.defaultInstalled = false, + this.defaultRunning = false, }); final String name; final String version; final String platform; final bool defaultInstalled; + final bool defaultRunning; @override State createState() => _AppTileState(); @@ -53,6 +55,7 @@ class _AppTileState extends State { final List actions = []; if (detect != widget) { isInstalled = widget.defaultInstalled; + isRunning = widget.defaultRunning; detect = widget; } if (isInstalled) { diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index cf80c45..1cbe090 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -10,11 +10,13 @@ class PlatformTile extends StatefulWidget { required this.name, required this.version, this.defaultInstalled = false, + this.defaultRunning = false, }); final String name; final String version; final bool defaultInstalled; + final bool defaultRunning; @override State createState() => _AppTileState(); @@ -49,6 +51,7 @@ class _AppTileState extends State { final List actions = []; if (detect != widget) { isInstalled = widget.defaultInstalled; + isRunning = widget.defaultRunning; detect = widget; } if (isInstalled) { From 3e745365be3a33882165db9bfd071ef30b1012e6 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sat, 17 Feb 2024 22:36:28 +0800 Subject: [PATCH 081/125] dart: primary page - sync tile state for running app - when app running - no remove/start for app - no remove for platform --- lib/page/primay.dart | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 765739c..dd37f30 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -25,6 +25,50 @@ class _PrimaryPageState extends State { late StreamSubscription downloadProgress; late StreamSubscription applicationEvent; + updateDependencyState() { + Map appRef = {}; + Map plmRef = {}; + for (final one in appList) { + print("${one.name}-${one.version}"); + appRef["${one.name}-${one.version}"] = 0; + } + for (final one in plmList) { + print("${one.name}-${one.version}"); + plmRef["${one.name}-${one.version}"] = 0; + } + for (final one in runtimeList) { + print("${one.process.name} ${one.process.platform}"); + appRef[one.process.name] = (appRef[one.process.name] ?? 0) + 1; + plmRef[one.process.platform] = (plmRef[one.process.name] ?? 0) + 1; + } + print("$plmRef $appRef"); + for (int i = 0, n = appList.length; i < n; i++) { + final one = appList[i]; + final running = (appRef["${one.name}-${one.version}"] ?? 0) > 0; + if (running != one.defaultRunning) { + appList[i] = AppTile( + name: one.name, + version: one.version, + platform: one.platform, + defaultInstalled: one.defaultInstalled, + defaultRunning: running + ); + } + } + for (int i = 0, n = plmList.length; i < n; i++) { + final one = plmList[i]; + final running = (plmRef["${one.name}-${one.version}"] ?? 0) > 0; + if (running != one.defaultRunning) { + plmList[i] = PlatformTile( + name: one.name, + version: one.version, + defaultInstalled: one.defaultInstalled, + defaultRunning: running + ); + } + } + } + @override void initState() { super.initState(); @@ -86,12 +130,14 @@ class _PrimaryPageState extends State { case "start": if (app == null || tile != null) return; runtimeList.add(AppRuntimeTile(process: app)); + updateDependencyState(); setState(() {}); break; case "stop": if (tile == null) return; final i = runtimeList.indexOf(tile); runtimeList.removeAt(i); + updateDependencyState(); setState(() {}); break; } From 3a757d098d2cf27185c9d9f9ff435d504a3f2aeb Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 19 Feb 2024 20:04:12 +0800 Subject: [PATCH 082/125] dart: splash - if already download lists, use cache - it avoids the case that for example if connect to github market blocked by firewall it will take long time to wait for init --- lib/ctrl/nodebase.dart | 18 ++++++++++++++---- lib/ctrl/platform.dart | 10 +++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 12bf871..b24779a 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -1,4 +1,5 @@ import 'dart:developer'; +import 'dart:io'; import '../ctrl/application.dart'; import '../ctrl/platform.dart'; @@ -26,20 +27,29 @@ class NodeBaseController { try { // TODO: read user settings, app list, platform list // get latest app, platform list from remote - await platform.downloadNodeBaseJson(); + final download = platform.downloadNodeBaseJson(); + if (!File(platform.getNodeBaseJsonFilename()).existsSync()) { + await download; + } } catch (e) { log("NodeBase [E] cannot download nodebase.json"); } isSupported = await platform.isSupported(); // TODO: check platform version; if no change, skip download list try { - await platform.downloadApplicationListJson(); + final download = platform.downloadApplicationListJson(); + if (!File(platform.getApplicationListJsonFilename()).existsSync()) { + await download; + } } catch(e) { - log("NodeBase [E] cannot download app-list.json.json"); + log("NodeBase [E] cannot download app-list.json"); } try { - await platform.downloadPlatformListJson(); + final download = platform.downloadPlatformListJson(); + if (!File(platform.getPlatformListJsonFilename()).existsSync()) { + await download; + } } catch(e) { log("NodeBase [E] cannot download plm-list.json"); } diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 74f16e7..bd456b5 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -103,6 +103,10 @@ class Platform { String _getApplicationBaseDir() => path.join(baseDir, "workspace", "app"); String _getPlatformBaseDir() => path.join(baseDir, "workspace", "plm"); + String getNodeBaseJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); + String getApplicationListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); + String getPlatformListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); + void changeBaseUrl(String url) { baseUrl = url; } Future isSupported() async { final config = await readNodeBaseJson(); @@ -161,7 +165,7 @@ class Platform { _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("nodebase.json", "$baseUrl/nodebase.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); + final targetFilename = getNodeBaseJsonFilename(); await fsGuaranteeDir(targetFilename); final tmpFile = File(tmpFilename); await tmpFile.copy(targetFilename); @@ -182,7 +186,7 @@ class Platform { _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("app-$os-$arch.json", "$baseUrl/app-$os-$arch.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); + final targetFilename = getApplicationListJsonFilename(); await fsGuaranteeDir(targetFilename); final tmpFile = File(tmpFilename); await tmpFile.copy(targetFilename); @@ -203,7 +207,7 @@ class Platform { _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); try { await _downloadFile("plm-$os-$arch.json", "$baseUrl/plm-$os-$arch.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); + final targetFilename = getPlatformListJsonFilename(); await fsGuaranteeDir(targetFilename); final tmpFile = File(tmpFilename); await tmpFile.copy(targetFilename); From 936ca8099407aec865b81edcf25337426a98bf5d Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 22 Feb 2024 16:03:03 +0800 Subject: [PATCH 083/125] dart: fix code style with `dart fix --apply` --- lib/comp/AppRuntimeTile.dart | 2 -- lib/comp/AppTile.dart | 2 +- lib/comp/PlatformTile.dart | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/AppRuntimeTile.dart index 037b6f4..6eb93b9 100755 --- a/lib/comp/AppRuntimeTile.dart +++ b/lib/comp/AppRuntimeTile.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import './util.dart'; import '../ctrl/application.dart'; -import '../util/event.dart' as event; -import '../ctrl/nodebase.dart' as nodebase; class AppRuntimeTile extends StatefulWidget { const AppRuntimeTile({super.key, required this.process}); diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index 071e033..ffe1ff6 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -121,7 +121,7 @@ class _AppTileState extends State { final confirmed = await showConfirmDialog( context, "Install Application", - "Do you confirm to install the application \"${name}-${version}\"?" + "Do you confirm to install the application \"$name-$version\"?" ); if (!confirmed) return "cancel"; isDownloading = true; diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index 1cbe090..d74116e 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -92,7 +92,7 @@ class _AppTileState extends State { final confirmed = await showConfirmDialog( context, "Install Platform", - "Do you confirm to install the platform \"${name}-${version}\"?" + "Do you confirm to install the platform \"$name-$version\"?" ); if (!confirmed) return "cancel"; isDownloading = true; From ec07555100bd1c3ae79c9c863cb83c09571053eb Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Thu, 22 Feb 2024 16:05:25 +0800 Subject: [PATCH 084/125] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fedebb5..aedaf04 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ For previous mature version, please explore source code on - [x] migrate kotlin service code - [x] implement windows adapter for MethodChannel and EventChannel -- [ ] rewrite new design UI in dart +- [x] rewrite new design UI in dart (basic flow) +- [ ] polish new design UI in dart - [ ] implement linux adapter - [ ] implement macosx adapter - [ ] implement web+ios adapter From de08493d8d0d7cc447e305d5c11424aac1911568 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 17 Mar 2024 19:31:10 +0800 Subject: [PATCH 085/125] linux: init method channel init method channel - open browser - get arch - get workspace dir --- linux/flutter/flutter_dart.h | 95 ++++++++++++++++++++++++++++++++++++ linux/my_application.cc | 2 + 2 files changed, 97 insertions(+) create mode 100755 linux/flutter/flutter_dart.h diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h new file mode 100755 index 0000000..df23ff8 --- /dev/null +++ b/linux/flutter/flutter_dart.h @@ -0,0 +1,95 @@ +#ifndef _FLUTTER_DART_ +#define _FLUTTER_DART_ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void utilBrowserOpen(const std::string &url) { + if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; + pid_t pid = fork(); + if (pid == -1) { + fprintf(stderr, "cannot open url (fork failed)\n"); + return; + } else if (pid == 0) { + execlp("xdg-open", "xdg-open", url.c_str(), (char*)nullptr); + fprintf(stderr, "cannot open url (execlp failed)\n"); + exit(-1); + } +} +std::string utilGetArch() { + std::string arch("linux-"); + struct utsname uts; + if (uname(&uts) < 0) { + arch += "unknown"; + } else if (strcmp("x86_64", uts.machine) == 0 || strcmp("ia64", uts.machine) == 0) { + arch += "x64"; + } else if (strcmp("x86", uts.machine) == 0 || strcmp("i386", uts.machine) == 0 || strcmp("i686", uts.machine) == 0) { + arch += "x86"; + } else if (strcmp("aarch64", uts.machine) == 0 || strcmp("arm64", uts.machine) == 0 || strcmp("armv8l", uts.machine) == 0) { + arch += "arm64"; + } else if (strcmp("arm", uts.machine) == 0 || strcmp("armv7l", uts.machine) == 0) { + arch += "arm"; + } else { + arch += "unknown"; + } + return arch; +} +std::string utilWorkspaceBaseDir() { + char buf[PATH_MAX]; + size_t len = readlink("/proc/self/exe", buf, sizeof(buf)); + if (len < 0) { + buf[0] = '\0'; + } else { + dirname(buf); + } + return std::string(buf); +} + +#define RETURN_BADARG_ERR(x) { fl_method_call_respond_error(method_call, "BAD_ARGS", "Invalid argument type for '" #x "'", nullptr, nullptr); return; } +void InitMethodChannel(FlView* flutter_instance) { + const static char *channel_name = "net.seven.lab.sevchat/app"; + + auto channel = fl_method_channel_new( + fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), + channel_name, + FL_METHOD_CODEC(fl_standard_method_codec_new()) + ); + fl_method_channel_set_method_call_handler( + channel, + [](FlMethodChannel *channel, FlMethodCall *method_call, gpointer user_data) { + g_autoptr(FlMethodResponse) response = nullptr; + const gchar *method_name = fl_method_call_get_name(method_call); + if (strcmp("util.browser.open", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.browser.open); + FlValue *url_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(url_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.browser.open); + std::string url = std::string(fl_value_get_string(url_)); + utilBrowserOpen(url); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); + } else if (strcmp("util.arch", method_name) == 0) { + g_autoptr(FlValue) val = fl_value_new_string(utilGetArch().c_str()); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); + } else if (strcmp("util.workspace", method_name) == 0) { + g_autoptr(FlValue) val = fl_value_new_string(utilWorkspaceBaseDir().c_str()); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); + } else { + response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); + } + fl_method_call_respond(method_call, response, nullptr); + }, + g_strdup("custom_channel"), g_free + ); +} +#undef RETURN_BADARG_ERR + +#endif // _FLUTTER_DART_ diff --git a/linux/my_application.cc b/linux/my_application.cc index d83a9d1..f6d803f 100755 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -6,6 +6,7 @@ #endif #include "flutter/generated_plugin_registrant.h" +#include "flutter/flutter_dart.h" struct _MyApplication { GtkApplication parent_instance; @@ -58,6 +59,7 @@ static void my_application_activate(GApplication* application) { gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + InitMethodChannel(view); gtk_widget_grab_focus(GTK_WIDGET(view)); } From d9b2242525ddfb1b89520daff329feedd5620b88 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 17 Mar 2024 21:21:29 +0800 Subject: [PATCH 086/125] linux: disable window resize --- linux/my_application.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/my_application.cc b/linux/my_application.cc index f6d803f..ea09614 100755 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -49,6 +49,7 @@ static void my_application_activate(GApplication* application) { } gtk_window_set_default_size(window, 360, 720); + gtk_window_set_resizable(window, FALSE); gtk_widget_show(GTK_WIDGET(window)); g_autoptr(FlDartProject) project = fl_dart_project_new(); From 7dc2b8718f3d3e16e4b13f60ff8028aa6860c7bf Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 17 Mar 2024 21:30:32 +0800 Subject: [PATCH 087/125] linux: fix method channel name typo --- linux/flutter/flutter_dart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index df23ff8..93aa05f 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -56,7 +56,7 @@ std::string utilWorkspaceBaseDir() { #define RETURN_BADARG_ERR(x) { fl_method_call_respond_error(method_call, "BAD_ARGS", "Invalid argument type for '" #x "'", nullptr, nullptr); return; } void InitMethodChannel(FlView* flutter_instance) { - const static char *channel_name = "net.seven.lab.sevchat/app"; + const static char *channel_name = "net.seven.nodebase/app"; auto channel = fl_method_channel_new( fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), From 06875c058e04c0c8af3a4a7b06cfc9f8b8d5b5fe Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 19 Mar 2024 10:40:26 +0800 Subject: [PATCH 088/125] linux: native api for mark file exectuable --- linux/flutter/flutter_dart.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 93aa05f..f538051 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,15 @@ void utilBrowserOpen(const std::string &url) { exit(-1); } } + +bool utilFileMarkExecutable(const std::string &filename) { + struct stat fileStat; + if (!stat(filename.c_str(), &fileStat)) return false; + mode_t newPerms = fileStat.st_mode | S_IXUSR; + if (!chmod(filename.c_str(), newPerms)) return false; + return true; +} + std::string utilGetArch() { std::string arch("linux-"); struct utsname uts; @@ -43,6 +53,7 @@ std::string utilGetArch() { } return arch; } + std::string utilWorkspaceBaseDir() { char buf[PATH_MAX]; size_t len = readlink("/proc/self/exe", buf, sizeof(buf)); @@ -68,7 +79,20 @@ void InitMethodChannel(FlView* flutter_instance) { [](FlMethodChannel *channel, FlMethodCall *method_call, gpointer user_data) { g_autoptr(FlMethodResponse) response = nullptr; const gchar *method_name = fl_method_call_get_name(method_call); - if (strcmp("util.browser.open", method_name) == 0) { + /* TODO: if (strcmp("app.stat", method_name) == 0) { + } else if (strcmp("app.start", method_name) == 0) { + } else if (strcmp("app.restart", method_name) == 0) { + } else if (strcmp("app.stop", method_name) == 0) { + } else if (strcmp("util.ip", method_name) == 0) { + } else*/ if (strcmp("util.file.executable", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.file.executable); + FlValue *filename_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(filename_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.file.executable); + std::string filename = std::string(fl_value_get_string(filename_)); + g_autoptr(FlValue) val = fl_value_new_bool(utilFileMarkExecutable(filename)); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); + } else if (strcmp("util.browser.open", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.browser.open); FlValue *url_ = fl_value_get_list_value(args, 0); From 4e0b66f9caa244c06366eda43ae62ce4466a4616 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 24 Mar 2024 13:47:12 +0800 Subject: [PATCH 089/125] linux: native api for get ips --- linux/flutter/flutter_dart.h | 47 ++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index f538051..d47b290 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -14,6 +14,10 @@ #include #include +#include +#include +#include + void utilBrowserOpen(const std::string &url) { if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; pid_t pid = fork(); @@ -65,6 +69,42 @@ std::string utilWorkspaceBaseDir() { return std::string(buf); } +bool _convertIpBinary2String(struct sockaddr *addr, char* buf, size_t buf_len) { + void *binAddr; + if (addr->sa_family == AF_INET) { + binAddr = &((struct sockaddr_in *)addr)->sin_addr; + } else if (ifa->sa_family == AF_INET6) { + binAddr = &((struct sockaddr_in6 *)addr)->sin6_addr; + } else { + return false; + } + if (!inet_ntop(addr->sa_family, binAddr, buf, buf_len)) return false; + return true; +} +bool utilGetIps(FlValue *map) { + struct ifaddrs *ifaddr, *cur; + const char *ifa_name; + char addrBuf[INET6_ADDRSTRLEN]; + FlValue *list; + if (getifaddrs(&ifaddr)) return false; + for (cur = ifaddr; cur != NULL; cur = cur->ifa_next) { + if (!cur->ifa_addr) continue; + ifa_name = cur->ifa_name; + if (!_convertIpBinary2String(cur->ifa_addr, addrBuf, INET6_ADDRSTRLEN)) continue; + list = fl_value_lookup_string(map, ifa_name); + if (list) { + g_autoptr(FlValue) value = fl_value_new_string(addrBuf); + fl_value_append_take(list, value); + } else { + g_autoptr(FlValue) newlist = fl_value_new_list(); + fl_value_set_string_take(map, ifa_name, newlist); + list = newlist; + } + fl_value_append_take (newlist, fl_value_new_string (addrBuf)); + } + return true; +} + #define RETURN_BADARG_ERR(x) { fl_method_call_respond_error(method_call, "BAD_ARGS", "Invalid argument type for '" #x "'", nullptr, nullptr); return; } void InitMethodChannel(FlView* flutter_instance) { const static char *channel_name = "net.seven.nodebase/app"; @@ -83,8 +123,11 @@ void InitMethodChannel(FlView* flutter_instance) { } else if (strcmp("app.start", method_name) == 0) { } else if (strcmp("app.restart", method_name) == 0) { } else if (strcmp("app.stop", method_name) == 0) { - } else if (strcmp("util.ip", method_name) == 0) { - } else*/ if (strcmp("util.file.executable", method_name) == 0) { + } else*/ if (strcmp("util.ip", method_name) == 0) { + g_autoptr(FlValue) val = fl_value_new_map(); + utilGetIps(val); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); + } else if (strcmp("util.file.executable", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.file.executable); FlValue *filename_ = fl_value_get_list_value(args, 0); From 57f1b7611c6b3cd1d597f46a91cbde8829c03dc0 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Sun, 24 Mar 2024 22:19:32 +0800 Subject: [PATCH 090/125] linux: add event channel --- linux/flutter/flutter_dart.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index d47b290..3fb8fc0 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -18,6 +18,9 @@ #include #include +static g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); +static FlEventChannel *eventHandler = nullptr; + void utilBrowserOpen(const std::string &url) { if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; pid_t pid = fork(); @@ -112,7 +115,7 @@ void InitMethodChannel(FlView* flutter_instance) { auto channel = fl_method_channel_new( fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), channel_name, - FL_METHOD_CODEC(fl_standard_method_codec_new()) + FL_METHOD_CODEC(codec) ); fl_method_channel_set_method_call_handler( channel, @@ -159,4 +162,12 @@ void InitMethodChannel(FlView* flutter_instance) { } #undef RETURN_BADARG_ERR +void InitEventChannel(FlView* flutter_instance) { + const static char *channel_name = "net.seven.nodebase/event"; + eventHandler = fl_event_channel_new( + fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), + channel_name, + FL_METHOD_CODEC(codec) + ); +} #endif // _FLUTTER_DART_ From 2f636d2133140dbb7cff17f754d36f11721e2391 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:19:15 +0800 Subject: [PATCH 091/125] linux: add native support for process start/stop --- linux/flutter/flutter_dart.h | 184 +++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 3fb8fc0..7273eab 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -18,9 +18,193 @@ #include #include +#include +#include +#include +#include +#include + static g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); static FlEventChannel *eventHandler = nullptr; +enum NodeAppSTAT { + BORN, READY, RUNNING, DEAD +}; + +class NodeAppMonitor { +public: + NodeAppMonitor(const std::string &name, const std::vector &cmd, const std::map &env) { + this->name = name; + this->cmd = cmd; + this->env = env; + this->stat = NodeAppSTAT::BORN; + this->curpid = -1; + this->pth = std::thread(NodeAppMonitor::Run, this); + } + ~NodeAppMonitor() { + this->Stop(); + if (this->pth.joinable()) this->pth.join(); + } + + void Start() { + this->stat = NodeAppSTAT::READY; + int argN = this->cmd.size(), envN = this->env.size(); + int status = 0; + const char *cmd = this->cmd.at(0).c_str(); + const char *args[argN+1], *env[envN+1]; + const char **cur; + + cur = args; + for (auto i = this->cmd.begin(); i != this->cmd.end(); i++) { + *cur = i->c_str(); + ++ cur; + } + *cur = nullptr; + + int envI = 0; + std::string envRaw[envN]; + for (auto i = this->env.begin(); i != this->env.end(); i++) { + envRaw[envI] = std::string(i->first) + "=" + std::string(i->second); + env[envI] = envRaw[envI].c_str(); + ++ envI; + } + env[envI] = nullptr; + + pid_t chpid = this->_startProcess(cmd, args, env); + if (chpid <= 0) { + this->stat = NodeAppSTAT::DEAD; + printf( + "NodeAppMonitor [E] \"%s\" start failure on CreateProcess.", + this->name.c_str() + ); + return; + } + this->curpid = chpid; + this->stat = NodeAppSTAT::RUNNING; + + { + g_autoptr(FlValue) message = fl_value_new_list (event); + g_autoptr(GError) error = NULL; + fl_value_append_take(message, fl_value_new_string ("start"); + fl_value_append_take(message, fl_value_new_string (this->name.c_str()); + fl_event_channel_send(eventHandler, message, NULL, &error); + } + + waitpid(chpid, &status, 0); + this->curpid = -1; + this->stat = NodeAppSTAT::DEAD; + + { + g_autoptr(FlValue) message = fl_value_new_list (event); + g_autoptr(GError) error = NULL; + fl_value_append_take(message, fl_value_new_string ("stop"); + fl_value_append_take(message, fl_value_new_string (this->name.c_str()); + fl_event_channel_send(eventHandler, message, NULL, &error); + } + } + + void Stop() { + if (!this->IsRunning()) return; + if (this->curpid <= 0) return; + int status = 0; + this->_stopProcessTree(this->curpid, SIGTERM); + waitpid(this->curpid, &status, 0); + } + + NodeAppMonitor* Restart() { + this->Stop(); + return new NodeAppMonitor(this->name, this->cmd, this->env); + } + void toJSON(FlValue* map) { + std::string rstat = "none"; + switch (this->stat) { + case NodeAppSTAT::RUNNING: + rstat = "running"; + break; + case NodeAppSTAT::DEAD: + rstat = "dead"; + break; + case NodeAppSTAT::READY: + rstat = "new"; + break; + case NodeAppSTAT::BORN: + default: + break; + } + g_autoptr(FlValue) statval = fl_value_new_string(rstat.c_str()); + fl_value_set_string_take(map, "stat", statval); + } + + bool IsRunning() { return this->stat == NodeAppSTAT::RUNNING; } + bool IsDead() { return this->stat == NodeAppSTAT::DEAD; } + + std::string GetName() { return this->name; } + std::vector GetCmd() { return this->cmd; } + std::map GetEnv() { return this->env; } +private: + static void Run(NodeAppMonitor* app) { + app->Start(); + } + + pid_t _startProcess(const char *cmd, const char **args, const char **env) { + pid_t pid = fork(); + if (pid == 0) { + execve(cmd, args, env); + exit(-1); + } else if (pid > 0){ + return pid; + } else { + return -1; + } + } + + bool _stopProcessTree(pid_t pid, int signal) { + DIR *dir; + struct dirent *entry; + char path[PATH_MAX]; + FILE *fp; + pid_t child_pid; + + // Open the /proc directory + dir = opendir("/proc"); + if (!dir) return false; + + // Iterate over each entry in /proc + while ((entry = readdir(dir)) != NULL) { + // Check if the entry is a directory and starts with a digit (representing a PID) + if (entry->d_type == DT_DIR && entry->d_name[0] >= '0' && entry->d_name[0] <= '9') { + sprintf(path, "/proc/%s/stat", entry->d_name); + fp = fopen(path, "r"); + if (fp) { + // Read the process information from the stat file + if (fscanf(fp, "%*d %*s %*c %d", &child_pid) == 1) { + // Check if the process is a child of the target process + if (child_pid == pid) { + // Kill the child process and its subprocesses recursively + this->_stopProcessTree(atoi(entry->d_name), signal); + } + } + fclose(fp); + } + } + } + + closedir(dir); + + // Kill the target process + kill(pid, signal); + return true; + } + +private: + NodeAppSTAT stat; + std::string name; + std::vector cmd; + std::map env; + std::thread pth; + pid_t curpid; +}; + void utilBrowserOpen(const std::string &url) { if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; pid_t pid = fork(); From 8c6275523aba8fd76cf0421947dbcd2e10e920a5 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:19:49 +0800 Subject: [PATCH 092/125] linux: bugfix - workspace base dir may be empty "" --- linux/flutter/flutter_dart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 7273eab..ab19ca4 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -248,7 +248,7 @@ std::string utilGetArch() { std::string utilWorkspaceBaseDir() { char buf[PATH_MAX]; size_t len = readlink("/proc/self/exe", buf, sizeof(buf)); - if (len < 0) { + if (len <= 0) { buf[0] = '\0'; } else { dirname(buf); From 1734649d22c901e2e2deb2f6a22700295da6bc42 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:24:16 +0800 Subject: [PATCH 093/125] linux: add aux functions for app start/stop/restart/stat --- linux/flutter/flutter_dart.h | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index ab19ca4..ea9b1f3 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -205,6 +205,50 @@ class NodeAppMonitor { pid_t curpid; }; +static std::map services; +static std::mutex service_lock; + +void appStart(const std::string &name, const std::vector &cmd, const std::map &env) { + std::lock_guard guard(service_lock); + auto app_ = services.find(name); + NodeAppMonitor *app; + if (app_ != services.end()) { + app = app_->second; + services.erase(name); + delete app; + } + app = new NodeAppMonitor(name, cmd, env); + // TODO: if (!app) {} // memory allocate failure + services.insert_or_assign(name, app); +} +void appStop(const std::string &name) { + std::lock_guard guard(service_lock); + auto app_ = services.find(name); + if (app_ == services.end()) return; + NodeAppMonitor *app = app_->second; + app->Stop(); +} +bool appRestart(const std::string &name) { + std::lock_guard guard(service_lock); + auto app_ = services.find(name); + if (app_ == services.end()) return false; + NodeAppMonitor *app = app_->second; + app->Stop(); + NodeAppMonitor *newapp = app->restart(); + if (newapp == nullptr) { + return false; + } + delete app; + services.insert_or_assign(name, newapp); + return true; +} +void appStat(const std::string &name, FlValue *map) { + auto app_ = services.find(name); + if (app_ == services.end()) return; + NodeAppMonitor *app = app_->second; + app->toJSON(map); +} + void utilBrowserOpen(const std::string &url) { if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; pid_t pid = fork(); From 99322ce4fc4bb9234cf7d3478e8c57230a44aaa2 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:26:33 +0800 Subject: [PATCH 094/125] linux: native support for app stop --- linux/flutter/flutter_dart.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index ea9b1f3..392beae 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -353,8 +353,15 @@ void InitMethodChannel(FlView* flutter_instance) { /* TODO: if (strcmp("app.stat", method_name) == 0) { } else if (strcmp("app.start", method_name) == 0) { } else if (strcmp("app.restart", method_name) == 0) { - } else if (strcmp("app.stop", method_name) == 0) { - } else*/ if (strcmp("util.ip", method_name) == 0) { + } else*/ if (strcmp("app.stop", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); + std::string name = std::string(fl_value_get_string(name_)); + appStop(name); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); + } else if (strcmp("util.ip", method_name) == 0) { g_autoptr(FlValue) val = fl_value_new_map(); utilGetIps(val); response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); From 279e891c0e020aed1433ca9c5f89eb736a4ae0ec Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:27:16 +0800 Subject: [PATCH 095/125] linux: native support for app restart --- linux/flutter/flutter_dart.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 392beae..238fbc1 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -352,8 +352,15 @@ void InitMethodChannel(FlView* flutter_instance) { const gchar *method_name = fl_method_call_get_name(method_call); /* TODO: if (strcmp("app.stat", method_name) == 0) { } else if (strcmp("app.start", method_name) == 0) { - } else if (strcmp("app.restart", method_name) == 0) { - } else*/ if (strcmp("app.stop", method_name) == 0) { + } else*/ if (strcmp("app.restart", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); + std::string name = std::string(fl_value_get_string(name_)); + appRestart(name); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); + } else if (strcmp("app.stop", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); FlValue *name_ = fl_value_get_list_value(args, 0); From 32ec70390916419cc5aab4ad2588bed5d8028117 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:29:35 +0800 Subject: [PATCH 096/125] linux: native support for app stat query --- linux/flutter/flutter_dart.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 238fbc1..0903e9c 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -350,9 +350,17 @@ void InitMethodChannel(FlView* flutter_instance) { [](FlMethodChannel *channel, FlMethodCall *method_call, gpointer user_data) { g_autoptr(FlMethodResponse) response = nullptr; const gchar *method_name = fl_method_call_get_name(method_call); - /* TODO: if (strcmp("app.stat", method_name) == 0) { - } else if (strcmp("app.start", method_name) == 0) { - } else*/ if (strcmp("app.restart", method_name) == 0) { + if (strcmp("app.stat", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); + std::string name = std::string(fl_value_get_string(name_)); + g_autoptr(FlValue) appstat = fl_value_new_map(); + appStat(name, appstat); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(appstat)); + /*} else if (strcmp("app.start", method_name) == 0) {*/ + } else if (strcmp("app.restart", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); FlValue *name_ = fl_value_get_list_value(args, 0); From e2a6a429c8619f6bd3dc405cba8db19d63dafb6e Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:38:31 +0800 Subject: [PATCH 097/125] linux: native support for app start --- linux/flutter/flutter_dart.h | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 0903e9c..e18413b 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -359,7 +359,37 @@ void InitMethodChannel(FlView* flutter_instance) { g_autoptr(FlValue) appstat = fl_value_new_map(); appStat(name, appstat); response = FL_METHOD_RESPONSE(fl_method_success_response_new(appstat)); - /*} else if (strcmp("app.start", method_name) == 0) {*/ + } else if (strcmp("app.start", method_name) == 0) { + FlValue *args = fl_method_call_get_args(method_call); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.start); + FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); + FlValue *cmd_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(cmd_) != FL_VALUE_TYPE_LIST) RETURN_BADARG_ERR(app.start); + FlValue *env_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(env_) != FL_VALUE_TYPE_MAP) RETURN_BADARG_ERR(app.start); + std::string name = std::string(fl_value_get_string(name_)); + + std::vector cmd; + for (size_t i = 0; i < fl_value_get_length(cmd_); i++) { + FlValue *cmdi = fl_value_get_list_value(cmd_, i); + if (fl_value_get_type(cmdi) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); + cmd.push_back(std::string(fl_value_get_string(cmdi))); + } + + std::map env; + for (size_t i = 0; i < fl_value_get_length(env_); i++) { + FlValue *envk_ = fl_value_get_map_key(env_, i); + if (fl_value_get_type(envk_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); + std::string envk = std::string(fl_value_get_string(envk_)); + FlValue *envv_ = fl_value_lookup_string(env_, envk.c_str()); + if (fl_value_get_type(envv_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); + std::string envv = std::string(fl_value_get_string(envv_)); + env.insert_or_assign(envk, envv); + } + + appStart(name, cmd, env); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); } else if (strcmp("app.restart", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); From f12aa2ee36ba7695448db4951ebe224b26432d01 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 12:39:04 +0800 Subject: [PATCH 098/125] linux: typo fix - error message should tell correct method name --- linux/flutter/flutter_dart.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index e18413b..8c0b6ec 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -352,9 +352,9 @@ void InitMethodChannel(FlView* flutter_instance) { const gchar *method_name = fl_method_call_get_name(method_call); if (strcmp("app.stat", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stat); FlValue *name_ = fl_value_get_list_value(args, 0); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stat); std::string name = std::string(fl_value_get_string(name_)); g_autoptr(FlValue) appstat = fl_value_new_map(); appStat(name, appstat); @@ -392,9 +392,9 @@ void InitMethodChannel(FlView* flutter_instance) { response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); } else if (strcmp("app.restart", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.restart); FlValue *name_ = fl_value_get_list_value(args, 0); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); + if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.restart); std::string name = std::string(fl_value_get_string(name_)); appRestart(name); response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); From d984aa09179cf24e1e37507d979e512ff2031bf9 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 13:13:18 +0800 Subject: [PATCH 099/125] linux: fix compilation errors --- linux/flutter/flutter_dart.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index 8c0b6ec..c5ab717 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -23,8 +23,8 @@ #include #include #include +#include -static g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); static FlEventChannel *eventHandler = nullptr; enum NodeAppSTAT { @@ -83,10 +83,10 @@ class NodeAppMonitor { this->stat = NodeAppSTAT::RUNNING; { - g_autoptr(FlValue) message = fl_value_new_list (event); + g_autoptr(FlValue) message = fl_value_new_list(); g_autoptr(GError) error = NULL; - fl_value_append_take(message, fl_value_new_string ("start"); - fl_value_append_take(message, fl_value_new_string (this->name.c_str()); + fl_value_append_take(message, fl_value_new_string ("start")); + fl_value_append_take(message, fl_value_new_string (this->name.c_str())); fl_event_channel_send(eventHandler, message, NULL, &error); } @@ -95,10 +95,10 @@ class NodeAppMonitor { this->stat = NodeAppSTAT::DEAD; { - g_autoptr(FlValue) message = fl_value_new_list (event); + g_autoptr(FlValue) message = fl_value_new_list(); g_autoptr(GError) error = NULL; - fl_value_append_take(message, fl_value_new_string ("stop"); - fl_value_append_take(message, fl_value_new_string (this->name.c_str()); + fl_value_append_take(message, fl_value_new_string ("stop")); + fl_value_append_take(message, fl_value_new_string (this->name.c_str())); fl_event_channel_send(eventHandler, message, NULL, &error); } } @@ -149,7 +149,7 @@ class NodeAppMonitor { pid_t _startProcess(const char *cmd, const char **args, const char **env) { pid_t pid = fork(); if (pid == 0) { - execve(cmd, args, env); + execve(cmd, (char * const *)args, (char * const *)env); exit(-1); } else if (pid > 0){ return pid; @@ -219,7 +219,7 @@ void appStart(const std::string &name, const std::vector &cmd, cons } app = new NodeAppMonitor(name, cmd, env); // TODO: if (!app) {} // memory allocate failure - services.insert_or_assign(name, app); + services.insert({name, app}); } void appStop(const std::string &name) { std::lock_guard guard(service_lock); @@ -234,12 +234,12 @@ bool appRestart(const std::string &name) { if (app_ == services.end()) return false; NodeAppMonitor *app = app_->second; app->Stop(); - NodeAppMonitor *newapp = app->restart(); + NodeAppMonitor *newapp = app->Restart(); if (newapp == nullptr) { return false; } delete app; - services.insert_or_assign(name, newapp); + services.insert({name, newapp}); return true; } void appStat(const std::string &name, FlValue *map) { @@ -304,7 +304,7 @@ bool _convertIpBinary2String(struct sockaddr *addr, char* buf, size_t buf_len) { void *binAddr; if (addr->sa_family == AF_INET) { binAddr = &((struct sockaddr_in *)addr)->sin_addr; - } else if (ifa->sa_family == AF_INET6) { + } else if (addr->sa_family == AF_INET6) { binAddr = &((struct sockaddr_in6 *)addr)->sin6_addr; } else { return false; @@ -331,7 +331,7 @@ bool utilGetIps(FlValue *map) { fl_value_set_string_take(map, ifa_name, newlist); list = newlist; } - fl_value_append_take (newlist, fl_value_new_string (addrBuf)); + fl_value_append_take(list, fl_value_new_string (addrBuf)); } return true; } @@ -339,6 +339,7 @@ bool utilGetIps(FlValue *map) { #define RETURN_BADARG_ERR(x) { fl_method_call_respond_error(method_call, "BAD_ARGS", "Invalid argument type for '" #x "'", nullptr, nullptr); return; } void InitMethodChannel(FlView* flutter_instance) { const static char *channel_name = "net.seven.nodebase/app"; + g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); auto channel = fl_method_channel_new( fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), @@ -385,7 +386,7 @@ void InitMethodChannel(FlView* flutter_instance) { FlValue *envv_ = fl_value_lookup_string(env_, envk.c_str()); if (fl_value_get_type(envv_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); std::string envv = std::string(fl_value_get_string(envv_)); - env.insert_or_assign(envk, envv); + env.insert({envk, envv}); } appStart(name, cmd, env); @@ -444,6 +445,7 @@ void InitMethodChannel(FlView* flutter_instance) { void InitEventChannel(FlView* flutter_instance) { const static char *channel_name = "net.seven.nodebase/event"; + g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); eventHandler = fl_event_channel_new( fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), channel_name, From 329a1ab0081952245cc6ddedec25c47d029d3e3b Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 15:40:20 +0800 Subject: [PATCH 100/125] linux: fix basic flow for native support - app start/stop/stat - file mark executable - open url - register event channel --- linux/flutter/flutter_dart.h | 84 ++++++++++++++++++++---------------- linux/my_application.cc | 1 + 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index c5ab717..c72366d 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -82,11 +82,11 @@ class NodeAppMonitor { this->curpid = chpid; this->stat = NodeAppSTAT::RUNNING; - { + if (eventHandler) { g_autoptr(FlValue) message = fl_value_new_list(); g_autoptr(GError) error = NULL; - fl_value_append_take(message, fl_value_new_string ("start")); - fl_value_append_take(message, fl_value_new_string (this->name.c_str())); + fl_value_append(message, fl_value_new_string ("start")); + fl_value_append(message, fl_value_new_string (this->name.c_str())); fl_event_channel_send(eventHandler, message, NULL, &error); } @@ -94,11 +94,11 @@ class NodeAppMonitor { this->curpid = -1; this->stat = NodeAppSTAT::DEAD; - { + if (eventHandler) { g_autoptr(FlValue) message = fl_value_new_list(); g_autoptr(GError) error = NULL; - fl_value_append_take(message, fl_value_new_string ("stop")); - fl_value_append_take(message, fl_value_new_string (this->name.c_str())); + fl_value_append(message, fl_value_new_string ("stop")); + fl_value_append(message, fl_value_new_string (this->name.c_str())); fl_event_channel_send(eventHandler, message, NULL, &error); } } @@ -132,7 +132,7 @@ class NodeAppMonitor { break; } g_autoptr(FlValue) statval = fl_value_new_string(rstat.c_str()); - fl_value_set_string_take(map, "stat", statval); + fl_value_set_string(map, "stat", statval); } bool IsRunning() { return this->stat == NodeAppSTAT::RUNNING; } @@ -312,26 +312,25 @@ bool _convertIpBinary2String(struct sockaddr *addr, char* buf, size_t buf_len) { if (!inet_ntop(addr->sa_family, binAddr, buf, buf_len)) return false; return true; } -bool utilGetIps(FlValue *map) { +bool utilGetIps(std::map> &map) { struct ifaddrs *ifaddr, *cur; const char *ifa_name; char addrBuf[INET6_ADDRSTRLEN]; - FlValue *list; if (getifaddrs(&ifaddr)) return false; for (cur = ifaddr; cur != NULL; cur = cur->ifa_next) { if (!cur->ifa_addr) continue; ifa_name = cur->ifa_name; if (!_convertIpBinary2String(cur->ifa_addr, addrBuf, INET6_ADDRSTRLEN)) continue; - list = fl_value_lookup_string(map, ifa_name); - if (list) { - g_autoptr(FlValue) value = fl_value_new_string(addrBuf); - fl_value_append_take(list, value); + std::string name = std::string(ifa_name); + std::string ipval = std::string(addrBuf); + auto list_ = map.find(name); + if (list_ == map.end()) { + std::vector newlist; + newlist.push_back(ipval); + map.insert({name, newlist}); } else { - g_autoptr(FlValue) newlist = fl_value_new_list(); - fl_value_set_string_take(map, ifa_name, newlist); - list = newlist; + list_->second.push_back(ipval); } - fl_value_append_take(list, fl_value_new_string (addrBuf)); } return true; } @@ -353,8 +352,8 @@ void InitMethodChannel(FlView* flutter_instance) { const gchar *method_name = fl_method_call_get_name(method_call); if (strcmp("app.stat", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stat); - FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stat); + FlValue *name_ = fl_value_lookup_string(args, "name"); if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stat); std::string name = std::string(fl_value_get_string(name_)); g_autoptr(FlValue) appstat = fl_value_new_map(); @@ -362,13 +361,13 @@ void InitMethodChannel(FlView* flutter_instance) { response = FL_METHOD_RESPONSE(fl_method_success_response_new(appstat)); } else if (strcmp("app.start", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.start); - FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 3) RETURN_BADARG_ERR(app.start); + FlValue *name_ = fl_value_lookup_string(args, "name"); if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - FlValue *cmd_ = fl_value_get_list_value(args, 0); + FlValue *cmd_ = fl_value_lookup_string(args, "cmd"); if (fl_value_get_type(cmd_) != FL_VALUE_TYPE_LIST) RETURN_BADARG_ERR(app.start); - FlValue *env_ = fl_value_get_list_value(args, 0); - if (fl_value_get_type(env_) != FL_VALUE_TYPE_MAP) RETURN_BADARG_ERR(app.start); + FlValue *env_ = fl_value_lookup_string(args, "env"); + if (fl_value_get_type(env_) != FL_VALUE_TYPE_MAP) env_ = nullptr; std::string name = std::string(fl_value_get_string(name_)); std::vector cmd; @@ -379,12 +378,12 @@ void InitMethodChannel(FlView* flutter_instance) { } std::map env; - for (size_t i = 0; i < fl_value_get_length(env_); i++) { + for (size_t i = 0; env_ && i < fl_value_get_length(env_); i++) { FlValue *envk_ = fl_value_get_map_key(env_, i); if (fl_value_get_type(envk_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - std::string envk = std::string(fl_value_get_string(envk_)); - FlValue *envv_ = fl_value_lookup_string(env_, envk.c_str()); + FlValue *envv_ = fl_value_get_map_value(env_, i); if (fl_value_get_type(envv_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); + std::string envk = std::string(fl_value_get_string(envk_)); std::string envv = std::string(fl_value_get_string(envv_)); env.insert({envk, envv}); } @@ -393,36 +392,45 @@ void InitMethodChannel(FlView* flutter_instance) { response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); } else if (strcmp("app.restart", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.restart); - FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.restart); + FlValue *name_ = fl_value_lookup_string(args, "name"); if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.restart); std::string name = std::string(fl_value_get_string(name_)); appRestart(name); response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); } else if (strcmp("app.stop", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); - FlValue *name_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); + FlValue *name_ = fl_value_lookup_string(args, "name"); if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); std::string name = std::string(fl_value_get_string(name_)); appStop(name); response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); } else if (strcmp("util.ip", method_name) == 0) { - g_autoptr(FlValue) val = fl_value_new_map(); - utilGetIps(val); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); + std::map> iptblmap; + utilGetIps(iptblmap); + g_autoptr(FlValue) iptbl = fl_value_new_map(); + for (auto i = iptblmap.begin(); i != iptblmap.end(); i++) { + g_autoptr(FlValue) list = fl_value_new_list(); + for (auto j = i->second.begin(); j != i->second.end(); j++) { + g_autoptr(FlValue) ip = fl_value_new_string(j->c_str()); + fl_value_append(list, ip); + } + fl_value_set_string(iptbl, i->first.c_str(), list); + } + response = FL_METHOD_RESPONSE(fl_method_success_response_new(iptbl)); } else if (strcmp("util.file.executable", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.file.executable); - FlValue *filename_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.file.executable); + FlValue *filename_ = fl_value_lookup_string(args, "filename"); if (fl_value_get_type(filename_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.file.executable); std::string filename = std::string(fl_value_get_string(filename_)); g_autoptr(FlValue) val = fl_value_new_bool(utilFileMarkExecutable(filename)); response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); } else if (strcmp("util.browser.open", method_name) == 0) { FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_LIST || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.browser.open); - FlValue *url_ = fl_value_get_list_value(args, 0); + if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.browser.open); + FlValue *url_ = fl_value_lookup_string(args, "url"); if (fl_value_get_type(url_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.browser.open); std::string url = std::string(fl_value_get_string(url_)); utilBrowserOpen(url); diff --git a/linux/my_application.cc b/linux/my_application.cc index ea09614..0b3d394 100755 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -61,6 +61,7 @@ static void my_application_activate(GApplication* application) { fl_register_plugins(FL_PLUGIN_REGISTRY(view)); InitMethodChannel(view); + InitEventChannel(view); gtk_widget_grab_focus(GTK_WIDGET(view)); } From 98db3aa85815c8411bd093298e1a8a6450da11be Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 15:42:43 +0800 Subject: [PATCH 101/125] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aedaf04..dd049d9 100755 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For previous mature version, please explore source code on - [x] implement windows adapter for MethodChannel and EventChannel - [x] rewrite new design UI in dart (basic flow) - [ ] polish new design UI in dart -- [ ] implement linux adapter +- [x] implement linux adapter - [ ] implement macosx adapter - [ ] implement web+ios adapter From 9e651df9fc4de479e59af26766d6bf93e5dcfb8c Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 16:31:56 +0800 Subject: [PATCH 102/125] dart: support unzip .tar.xz files --- lib/ctrl/platform.dart | 11 +++++++++++ lib/util/fs.dart | 26 +++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index bd456b5..768a50f 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -280,6 +280,10 @@ class Platform { final targetFilename = path.join(_getApplicationBaseDir(), hash); await fsMkdir(targetFilename); await fsUnzipFiles(tmpFilename, targetFilename); + } else if (baseName.endsWith(".tar.xz")) { + final targetFilename = path.join(_getApplicationBaseDir(), hash); + await fsMkdir(targetFilename); + await fsUnzipXzTarFiles(tmpFilename, targetFilename); } else { final targetFilename = path.join(_getApplicationBaseDir(), hash, baseName); await fsGuaranteeDir(targetFilename); @@ -312,6 +316,13 @@ class Platform { for (final fname in await listPlatformExecutableList(name, version)) { await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); } + } else if (baseName.endsWith(".tar.xz")) { + final targetFilename = path.join(_getPlatformBaseDir(), hash); + await fsMkdir(targetFilename); + await fsUnzipXzTarFiles(tmpFilename, targetFilename); + for (final fname in await listPlatformExecutableList(name, version)) { + await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); + } } else { final targetFilename = path.join(_getPlatformBaseDir(), hash, baseName); await fsGuaranteeDir(targetFilename); diff --git a/lib/util/fs.dart b/lib/util/fs.dart index d270ee1..eff8061 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -196,6 +196,30 @@ Future fsUnzipFiles(String zipFilename, String dstDir) async { } } +Future fsUnzipXzTarFiles(String xztarFilename, String dstDir) async { + try { + final bytes = File(xztarFilename).readAsBytesSync(); + + // Decode the Zip archive + final archive = TarDecoder().decodeBytes(XZDecoder().decodeBytes(bytes)); + + for (final file in archive) { + final filename = file.name; + if (file.isFile) { + final data = file.content as List; + File(path.join(dstDir, filename)) + ..createSync(recursive: true) + ..writeAsBytesSync(data); + } else { + Directory(path.join(dstDir, filename)) + .createSync(recursive: true); + } + } + } catch (e) { + log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); + } +} + Future fsGuaranteeDir(String filename) async { final dir = Directory(path.dirname(filename)); if (!dir.existsSync()) { @@ -303,4 +327,4 @@ Future fsCalcHash(String filename) async { Future fsCalcStringHash(String text) async { final digest = sha256.convert(utf8.encode(text)); return digest.toString(); -} \ No newline at end of file +} From 220a58c672cf3c709128653f42284611ba6b9340 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 16:32:22 +0800 Subject: [PATCH 103/125] linux: bugfix - ensure file can be marked as executable --- linux/flutter/flutter_dart.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h index c72366d..052913b 100755 --- a/linux/flutter/flutter_dart.h +++ b/linux/flutter/flutter_dart.h @@ -264,9 +264,9 @@ void utilBrowserOpen(const std::string &url) { bool utilFileMarkExecutable(const std::string &filename) { struct stat fileStat; - if (!stat(filename.c_str(), &fileStat)) return false; + if (stat(filename.c_str(), &fileStat)) {printf("%o\n", fileStat.st_mode);return false;} mode_t newPerms = fileStat.st_mode | S_IXUSR; - if (!chmod(filename.c_str(), newPerms)) return false; + if (chmod(filename.c_str(), newPerms)) return false; return true; } From 1131537fa6b49ddef977d4b898e17d8965f81944 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 17:28:44 +0800 Subject: [PATCH 104/125] dart: support unpack .tar .tar.gz .tgz .tar.bz2 .tbz2 --- lib/ctrl/platform.dart | 51 ++++++++++++++++++----------- lib/util/fs.dart | 74 +++++++++++++++++++++++++++--------------- 2 files changed, 80 insertions(+), 45 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 768a50f..629dde2 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -276,18 +276,26 @@ class Platform { try { await _downloadFile("app-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); + Function(String, String)? unzipFn = null; if (baseName.endsWith(".zip")) { - final targetFilename = path.join(_getApplicationBaseDir(), hash); - await fsMkdir(targetFilename); - await fsUnzipFiles(tmpFilename, targetFilename); + unzipFn = fsUnzipFiles; + } else if (baseName.endsWith(".tar")) { + unzipFn = fsUnzipTarFiles; } else if (baseName.endsWith(".tar.xz")) { - final targetFilename = path.join(_getApplicationBaseDir(), hash); - await fsMkdir(targetFilename); - await fsUnzipXzTarFiles(tmpFilename, targetFilename); - } else { + unzipFn = fsUnzipXzTarFiles; + } else if (baseName.endsWith(".tar.gz") || baseName.endsWith(".tgz")) { + unzipFn = fsUnzipGzTarFiles; + } else if (baseName.endsWith(".tar.bz2") || baseName.endsWith(".tbz2")) { + unzipFn = fsUnzipBzTarFiles; + } + if (unzipFn == null) { final targetFilename = path.join(_getApplicationBaseDir(), hash, baseName); await fsGuaranteeDir(targetFilename); await tmpFile.copy(targetFilename); + } else { + final targetFilename = path.join(_getApplicationBaseDir(), hash); + await fsMkdir(targetFilename); + await unzipFn(tmpFilename, targetFilename); } await tmpFile.delete(); await _configListAdd("app-list.json", name, "$version:$platform"); @@ -309,25 +317,30 @@ class Platform { try { await _downloadFile("plm-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); + Function(String, String)? unzipFn = null; if (baseName.endsWith(".zip")) { - final targetFilename = path.join(_getPlatformBaseDir(), hash); - await fsMkdir(targetFilename); - await fsUnzipFiles(tmpFilename, targetFilename); - for (final fname in await listPlatformExecutableList(name, version)) { - await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); - } + unzipFn = fsUnzipFiles; + } else if (baseName.endsWith(".tar")) { + unzipFn = fsUnzipTarFiles; } else if (baseName.endsWith(".tar.xz")) { + unzipFn = fsUnzipXzTarFiles; + } else if (baseName.endsWith(".tar.gz") || baseName.endsWith(".tgz")) { + unzipFn = fsUnzipGzTarFiles; + } else if (baseName.endsWith(".tar.bz2") || baseName.endsWith(".tbz2")) { + unzipFn = fsUnzipBzTarFiles; + } + if (unzipFn == null) { + final targetFilename = path.join(_getPlatformBaseDir(), hash, baseName); + await fsGuaranteeDir(targetFilename); + await tmpFile.copy(targetFilename); + await NodeBaseApi.apiUtilMarkExecutable(targetFilename); + } else { final targetFilename = path.join(_getPlatformBaseDir(), hash); await fsMkdir(targetFilename); - await fsUnzipXzTarFiles(tmpFilename, targetFilename); + await unzipFn(tmpFilename, targetFilename); for (final fname in await listPlatformExecutableList(name, version)) { await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); } - } else { - final targetFilename = path.join(_getPlatformBaseDir(), hash, baseName); - await fsGuaranteeDir(targetFilename); - await tmpFile.copy(targetFilename); - await NodeBaseApi.apiUtilMarkExecutable(targetFilename); } await tmpFile.delete(); await _configListAdd("plm-list.json", name, version); diff --git a/lib/util/fs.dart b/lib/util/fs.dart index eff8061..aadfcf3 100755 --- a/lib/util/fs.dart +++ b/lib/util/fs.dart @@ -175,22 +175,20 @@ Future fsZipFiles(String zipFilename, List files) async { Future fsUnzipFiles(String zipFilename, String dstDir) async { try { final bytes = File(zipFilename).readAsBytesSync(); - // Decode the Zip archive final archive = ZipDecoder().decodeBytes(bytes); + await fsUnzip(archive, dstDir); + } catch (e) { + log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); + } +} - for (final file in archive) { - final filename = file.name; - if (file.isFile) { - final data = file.content as List; - File(path.join(dstDir, filename)) - ..createSync(recursive: true) - ..writeAsBytesSync(data); - } else { - Directory(path.join(dstDir, filename)) - .createSync(recursive: true); - } - } +Future fsUnzipTarFiles(String tarFilename, String dstDir) async { + try { + final bytes = File(tarFilename).readAsBytesSync(); + // Decode the Zip archive + final archive = TarDecoder().decodeBytes(bytes); + await fsUnzip(archive, dstDir); } catch (e) { log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); } @@ -199,27 +197,51 @@ Future fsUnzipFiles(String zipFilename, String dstDir) async { Future fsUnzipXzTarFiles(String xztarFilename, String dstDir) async { try { final bytes = File(xztarFilename).readAsBytesSync(); - // Decode the Zip archive final archive = TarDecoder().decodeBytes(XZDecoder().decodeBytes(bytes)); + await fsUnzip(archive, dstDir); + } catch (e) { + log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); + } +} - for (final file in archive) { - final filename = file.name; - if (file.isFile) { - final data = file.content as List; - File(path.join(dstDir, filename)) - ..createSync(recursive: true) - ..writeAsBytesSync(data); - } else { - Directory(path.join(dstDir, filename)) - .createSync(recursive: true); - } - } +Future fsUnzipGzTarFiles(String gztarFilename, String dstDir) async { + try { + final bytes = File(gztarFilename).readAsBytesSync(); + // Decode the Zip archive + final archive = TarDecoder().decodeBytes(GZipDecoder().decodeBytes(bytes)); + await fsUnzip(archive, dstDir); + } catch (e) { + log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); + } +} + +Future fsUnzipBzTarFiles(String bztarFilename, String dstDir) async { + try { + final bytes = File(bztarFilename).readAsBytesSync(); + // Decode the Zip archive + final archive = TarDecoder().decodeBytes(BZip2Decoder().decodeBytes(bytes)); + await fsUnzip(archive, dstDir); } catch (e) { log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); } } +Future fsUnzip(Archive archive, String dstDir) async { + for (final file in archive) { + final filename = file.name; + if (file.isFile) { + final data = file.content as List; + File(path.join(dstDir, filename)) + ..createSync(recursive: true) + ..writeAsBytesSync(data); + } else { + Directory(path.join(dstDir, filename)) + .createSync(recursive: true); + } + } +} + Future fsGuaranteeDir(String filename) async { final dir = Directory(path.dirname(filename)); if (!dir.existsSync()) { From 35afd1305786295ac7cdad9dbf1a33ce3647c1b1 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 17:37:06 +0800 Subject: [PATCH 105/125] dart: minor dart fix --- lib/ctrl/platform.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform.dart index 629dde2..bccf424 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform.dart @@ -276,7 +276,7 @@ class Platform { try { await _downloadFile("app-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); - Function(String, String)? unzipFn = null; + Function(String, String)? unzipFn; if (baseName.endsWith(".zip")) { unzipFn = fsUnzipFiles; } else if (baseName.endsWith(".tar")) { @@ -317,7 +317,7 @@ class Platform { try { await _downloadFile("plm-$name-$version.bin", url, tmpFilename, cancel); final tmpFile = File(tmpFilename); - Function(String, String)? unzipFn = null; + Function(String, String)? unzipFn; if (baseName.endsWith(".zip")) { unzipFn = fsUnzipFiles; } else if (baseName.endsWith(".tar")) { From e855e5be273b3054b4f3ddecce71e78878b58ced Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 18:34:13 +0800 Subject: [PATCH 106/125] dart: if market place remove app/plm, show them as well - show app/plm even it is not in the market place list - for example, before a user download node-20.11.0 later, it is updated to node-20.11.1 and market place has no node-20.11.0 anymore, node-20.11.0 should still show in the user available platform list - mark app/plm not in the market place list with an icon --- lib/comp/AppTile.dart | 19 +++++++++++++--- lib/comp/PlatformTile.dart | 20 +++++++++++++---- lib/page/primay.dart | 44 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 9 deletions(-) diff --git a/lib/comp/AppTile.dart b/lib/comp/AppTile.dart index ffe1ff6..92b52f6 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/AppTile.dart @@ -1,5 +1,6 @@ import 'dart:developer'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import './runAppSteps.dart'; import './util.dart'; @@ -13,6 +14,7 @@ class AppTile extends StatefulWidget { required this.platform, this.defaultInstalled = false, this.defaultRunning = false, + this.userDefined = false, }); final String name; @@ -20,6 +22,7 @@ class AppTile extends StatefulWidget { final String platform; final bool defaultInstalled; final bool defaultRunning; + final bool userDefined; @override State createState() => _AppTileState(); @@ -152,9 +155,19 @@ class _AppTileState extends State { title: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Text( - "${widget.name}-${widget.version}", - overflow: TextOverflow.ellipsis, + Row( + children: [ + ...(widget.userDefined ? [ + const Tooltip( + message: "Not in marketplace", + child: Icon(Icons.person_pin_circle_rounded, size: 12), + ), + ]: []), + Expanded(child: Text( + "${widget.name}-${widget.version}", + overflow: TextOverflow.ellipsis, + )), + ], ), ], ), diff --git a/lib/comp/PlatformTile.dart b/lib/comp/PlatformTile.dart index d74116e..1fd6592 100755 --- a/lib/comp/PlatformTile.dart +++ b/lib/comp/PlatformTile.dart @@ -11,12 +11,14 @@ class PlatformTile extends StatefulWidget { required this.version, this.defaultInstalled = false, this.defaultRunning = false, + this.userDefined = false, }); final String name; final String version; final bool defaultInstalled; final bool defaultRunning; + final bool userDefined; @override State createState() => _AppTileState(); @@ -123,10 +125,20 @@ class _AppTileState extends State { title: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Text( - "${widget.name}-${widget.version}", - overflow: TextOverflow.ellipsis, - ), + Row( + children: [ + ...(widget.userDefined ? [ + const Tooltip( + message: "Not in marketplace", + child: Icon(Icons.person_pin_circle_rounded, size: 12), + ), + ]: []), + Expanded(child: Text( + "${widget.name}-${widget.version}", + overflow: TextOverflow.ellipsis, + )), + ], + ) ], ), subtitle: Column( diff --git a/lib/page/primay.dart b/lib/page/primay.dart index dd37f30..62aef74 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -164,13 +164,31 @@ class _PrimaryPageState extends State { })().then((list) { final [listAp, listIp] = list; final List r = []; + listIp.forEach((name, versions) { + for (final version in versions) { + if (listAp.containsKey(name) && listAp[name]!.contains(version)) continue; + final p = PlatformTile( + name: name, + version: version, + defaultInstalled: true, + userDefined: true + ); + r.add(p); + } + }); listAp.forEach((name, versions) { for (final version in versions) { final installed = listIp.containsKey(name) && listIp[name]!.contains(version); - final p = PlatformTile(name: name, version: version, defaultInstalled: installed); + final p = PlatformTile( + name: name, + version: version, + defaultInstalled: installed, + userDefined: false + ); r.add(p); } }); + // TODO: sort r and installed ones should at top setState(() { plmList.clear(); plmList.addAll(r); @@ -188,13 +206,35 @@ class _PrimaryPageState extends State { })().then((list) { final [listAa, listIa] = list; final List r = []; + listIa.forEach((name, vps) { + for (final vp in vps) { + if (listAa.containsKey(name) && listAa[name]!.contains(vp)) continue; + final i = vp.indexOf(':'); + final version = vp.substring(0, i); + final platform = vp.substring(i+1); + final a = AppTile( + name: name, + version: version, + defaultInstalled: true, + platform: platform, + userDefined: true + ); + r.add(a); + } + }); listAa.forEach((name, vps) { for (final vp in vps) { final i = vp.indexOf(':'); final version = vp.substring(0, i); final platform = vp.substring(i+1); final installed = listIa.containsKey(name) && listIa[name]!.contains(vp); - final a = AppTile(name: name, version: version, defaultInstalled: installed, platform: platform); + final a = AppTile( + name: name, + version: version, + defaultInstalled: installed, + platform: platform, + userDefined: true + ); r.add(a); } }); From df0a2e72a2c55b7a7f88624ad484f0e788dacd35 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 18:36:33 +0800 Subject: [PATCH 107/125] upgrade flutter to 3.19 --- pubspec.lock | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 91dea57..9b644bd 100755 --- a/pubspec.lock +++ b/pubspec.lock @@ -120,6 +120,30 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.7.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.flutter-io.cn" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -132,34 +156,34 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.flutter-io.cn" source: hosted - version: "1.10.0" + version: "1.11.0" path: dependency: "direct main" description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.3" + version: "1.9.0" pointycastle: dependency: transitive description: @@ -237,13 +261,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.0" + version: "13.0.0" sdks: dart: ">=3.2.4 <4.0.0" From ce61781b5a6ae5c47e4a4d5673f545c28f37afda Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 18:40:34 +0800 Subject: [PATCH 108/125] dart: bugfix - app in marketplace should not have icon marked --- lib/page/primay.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 62aef74..b300482 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -233,7 +233,7 @@ class _PrimaryPageState extends State { version: version, defaultInstalled: installed, platform: platform, - userDefined: true + userDefined: false ); r.add(a); } From c1a10a4809829e05193286804b5c8a5d20837c28 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Mon, 25 Mar 2024 19:30:23 +0800 Subject: [PATCH 109/125] dart: remove unused print --- lib/page/primay.dart | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/page/primay.dart b/lib/page/primay.dart index b300482..300b8bf 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -29,19 +29,15 @@ class _PrimaryPageState extends State { Map appRef = {}; Map plmRef = {}; for (final one in appList) { - print("${one.name}-${one.version}"); appRef["${one.name}-${one.version}"] = 0; } for (final one in plmList) { - print("${one.name}-${one.version}"); plmRef["${one.name}-${one.version}"] = 0; } for (final one in runtimeList) { - print("${one.process.name} ${one.process.platform}"); appRef[one.process.name] = (appRef[one.process.name] ?? 0) + 1; plmRef[one.process.platform] = (plmRef[one.process.name] ?? 0) + 1; } - print("$plmRef $appRef"); for (int i = 0, n = appList.length; i < n; i++) { final one = appList[i]; final running = (appRef["${one.name}-${one.version}"] ?? 0) > 0; From 2bad376cb3ccf1db8620c10d115027bb4e561cca Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 26 Mar 2024 14:36:12 +0800 Subject: [PATCH 110/125] dart: minor - follow dart file naming standard --- lib/comp/{AppRuntimeTile.dart => app_runtime_tile.dart} | 0 lib/comp/{AppTile.dart => app_tile.dart} | 3 +-- lib/comp/{DownloadTile.dart => download_tile.dart} | 0 lib/comp/{PlatformTile.dart => platform_tile.dart} | 0 lib/comp/{runAppSteps.dart => run_app_steps.dart} | 0 lib/page/{notSupported.dart => not_supported.dart} | 0 lib/page/primay.dart | 8 ++++---- lib/page/splash.dart | 6 +++--- 8 files changed, 8 insertions(+), 9 deletions(-) rename lib/comp/{AppRuntimeTile.dart => app_runtime_tile.dart} (100%) rename lib/comp/{AppTile.dart => app_tile.dart} (95%) rename lib/comp/{DownloadTile.dart => download_tile.dart} (100%) rename lib/comp/{PlatformTile.dart => platform_tile.dart} (100%) rename lib/comp/{runAppSteps.dart => run_app_steps.dart} (100%) rename lib/page/{notSupported.dart => not_supported.dart} (100%) diff --git a/lib/comp/AppRuntimeTile.dart b/lib/comp/app_runtime_tile.dart similarity index 100% rename from lib/comp/AppRuntimeTile.dart rename to lib/comp/app_runtime_tile.dart diff --git a/lib/comp/AppTile.dart b/lib/comp/app_tile.dart similarity index 95% rename from lib/comp/AppTile.dart rename to lib/comp/app_tile.dart index 92b52f6..77177c0 100755 --- a/lib/comp/AppTile.dart +++ b/lib/comp/app_tile.dart @@ -1,8 +1,7 @@ import 'dart:developer'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import './runAppSteps.dart'; +import './run_app_steps.dart'; import './util.dart'; import '../ctrl/nodebase.dart' as nodebase; diff --git a/lib/comp/DownloadTile.dart b/lib/comp/download_tile.dart similarity index 100% rename from lib/comp/DownloadTile.dart rename to lib/comp/download_tile.dart diff --git a/lib/comp/PlatformTile.dart b/lib/comp/platform_tile.dart similarity index 100% rename from lib/comp/PlatformTile.dart rename to lib/comp/platform_tile.dart diff --git a/lib/comp/runAppSteps.dart b/lib/comp/run_app_steps.dart similarity index 100% rename from lib/comp/runAppSteps.dart rename to lib/comp/run_app_steps.dart diff --git a/lib/page/notSupported.dart b/lib/page/not_supported.dart similarity index 100% rename from lib/page/notSupported.dart rename to lib/page/not_supported.dart diff --git a/lib/page/primay.dart b/lib/page/primay.dart index 300b8bf..a328016 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -4,10 +4,10 @@ import 'package:flutter/material.dart'; import '../util/api.dart'; import '../util/event.dart' as event; import '../ctrl/nodebase.dart' as nodebase; -import '../comp/AppRuntimeTile.dart'; -import '../comp/DownloadTile.dart'; -import '../comp/AppTile.dart'; -import '../comp/PlatformTile.dart'; +import '../comp/app_runtime_tile.dart'; +import '../comp/download_tile.dart'; +import '../comp/app_tile.dart'; +import '../comp/platform_tile.dart'; class PrimaryPage extends StatefulWidget { const PrimaryPage({super.key}); diff --git a/lib/page/splash.dart b/lib/page/splash.dart index 841e6e3..1a3e60f 100755 --- a/lib/page/splash.dart +++ b/lib/page/splash.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:nodebase/page/notSupported.dart'; -import 'package:nodebase/page/primay.dart'; +import './not_supported.dart'; +import './primay.dart'; import '../util/event.dart' as event; import '../ctrl/nodebase.dart' as nodebase; @@ -85,4 +85,4 @@ class _SplashPageState extends State { ); } -} \ No newline at end of file +} From 7c0d3d4b53decdd5eb0b1a25b71cdb2792ab59d6 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 26 Mar 2024 15:13:19 +0800 Subject: [PATCH 111/125] dart: minor - remove unused code --- lib/comp/run_app_steps.dart | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/comp/run_app_steps.dart b/lib/comp/run_app_steps.dart index dc54502..613c2fd 100755 --- a/lib/comp/run_app_steps.dart +++ b/lib/comp/run_app_steps.dart @@ -174,8 +174,6 @@ Future runAppInit(BuildContext context, Map config) async } Future runAppStepCheckPlatform(BuildContext context, Map config) async { - final name = config["name"]; - final version = config["version"]; final platform = config["platform"]; if (config["platformList"][platform] == null) { // no install, check available and guide to download @@ -344,8 +342,6 @@ EnvInput generateEnvInput(List envItems, List envk, List runAppStepArgAndEnv(BuildContext context, Map config) async { final name = config["name"]; final version = config["version"]; - final platform = config["platform"]; - // TODO: show component to edit arg (List) and env(Map) final availableEntryPoint = config["availableEntryPoint"]; final List> dropdownItems = [ const DropdownMenuItem(value: "-", child: Text("(not selected)")), From ebf9d45cd957d0ac1fe22b824af3d0e223dfef4b Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 11:07:09 +0800 Subject: [PATCH 112/125] dart: refact with creating interfaces - add abstract interfaces to define workflow - apply abstract interfaces for local workflow - mainly for windows/linux/macos - currently for android (in future, may change to remote workflow) --- lib/comp/app_runtime_tile.dart | 19 +++++---- lib/comp/platform_tile.dart | 4 +- lib/comp/run_app_steps.dart | 4 +- lib/comp/util.dart | 3 ++ lib/ctrl/application_def.dart | 17 ++++++++ ...pplication.dart => application_local.dart} | 25 +++++++++-- lib/ctrl/nodebase.dart | 16 ++++--- lib/ctrl/platform_def.dart | 36 ++++++++++++++++ .../{platform.dart => platform_local.dart} | 42 +++++++++++++++++-- lib/page/not_supported.dart | 2 +- lib/page/primay.dart | 6 +-- 11 files changed, 144 insertions(+), 30 deletions(-) create mode 100755 lib/ctrl/application_def.dart rename lib/ctrl/{application.dart => application_local.dart} (79%) create mode 100755 lib/ctrl/platform_def.dart rename lib/ctrl/{platform.dart => platform_local.dart} (94%) diff --git a/lib/comp/app_runtime_tile.dart b/lib/comp/app_runtime_tile.dart index 6eb93b9..92da317 100755 --- a/lib/comp/app_runtime_tile.dart +++ b/lib/comp/app_runtime_tile.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import './util.dart'; -import '../ctrl/application.dart'; +import '../ctrl/application_def.dart'; class AppRuntimeTile extends StatefulWidget { const AppRuntimeTile({super.key, required this.process}); - final ApplicationProcess process; + final IApplicationProcess process; @override State createState() => _AppRuntimeTileState(); @@ -26,11 +26,11 @@ class _AppRuntimeTileState extends State { @override Widget build(BuildContext context) { return ListTile( - title: Text(widget.process.name), + title: Text(widget.process.getName()), subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text("platform: ${widget.process.platform}"), + Text("platform: ${widget.process.getPlatform()}"), ], ), trailing: Wrap( @@ -43,13 +43,13 @@ class _AppRuntimeTileState extends State { showConfirmDialog( context, "Stop Application", - "Do you confirm to stop the application \"${widget.process.name}\"?" + "Do you confirm to stop the application \"${widget.process.getName()}\"?" ).then((confirmed) { if (!confirmed) return; widget.process.stop().then((_) { generateSnackBar( context, - "Stopped application \"${widget.process.name}\"" + "Stopped application \"${widget.process.getName()}\"" ); }); }); @@ -61,8 +61,9 @@ class _AppRuntimeTileState extends State { } void showInfo(BuildContext context) { - final cmdMain = widget.process.cmd[0]; - final cmdEntry = widget.process.cmd.length > 1 ? "\n${widget.process.cmd[1]}" : ""; + final cmd = widget.process.getCmd(); + final cmdMain = cmd[0]; + final cmdEntry = cmd.length > 1 ? "\n${cmd[1]}" : ""; showDialog(context: context, builder: (_) => AlertDialog( title: const Text("Application Info"), shape: const BeveledRectangleBorder(), @@ -77,7 +78,7 @@ class _AppRuntimeTileState extends State { SelectableText("$cmdMain$cmdEntry"), const Divider(), const Text("-- ENV --"), - SelectableText(widget.process.env.entries.map( + SelectableText(widget.process.getEnv().entries.map( (kv) => "${kv.key} =\n${kv.value}" ).toList().join("\n\n")), ], diff --git a/lib/comp/platform_tile.dart b/lib/comp/platform_tile.dart index 1fd6592..e9ad422 100755 --- a/lib/comp/platform_tile.dart +++ b/lib/comp/platform_tile.dart @@ -144,7 +144,7 @@ class _AppTileState extends State { subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text("(${nodebase.instance.platform.os}-${nodebase.instance.platform.arch})") + Text("(${nodebase.instance.platform.getName()})") ], ), trailing: Wrap( @@ -168,7 +168,7 @@ class _AppTileState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ const Text("-- Basic -- "), - SelectableText("$name-$version\n(${nodebase.instance.platform.os}-${nodebase.instance.platform.arch})"), + SelectableText("$name-$version\n(${nodebase.instance.platform.getName()})"), ], ), ), diff --git a/lib/comp/run_app_steps.dart b/lib/comp/run_app_steps.dart index 613c2fd..7f987d1 100755 --- a/lib/comp/run_app_steps.dart +++ b/lib/comp/run_app_steps.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:path/path.dart' as path; -import '../ctrl/application.dart'; +import '../ctrl/application_def.dart'; import '../ctrl/nodebase.dart' as nodebase; import './util.dart'; @@ -460,7 +460,7 @@ Future runAppStepArgAndEnv(BuildContext context, Map conf return true; } -Future runAppStepReview(BuildContext context, Map config) async { +Future runAppStepReview(BuildContext context, Map config) async { final name = config["name"]; final version = config["version"]; final platform = config["platform"]; diff --git a/lib/comp/util.dart b/lib/comp/util.dart index 381766d..cf23f99 100755 --- a/lib/comp/util.dart +++ b/lib/comp/util.dart @@ -10,6 +10,9 @@ SnackBar generateSnackBar(BuildContext context, String content, { action: SnackBarAction( label: "X", onPressed: () { + // TODO: To safely refer to a widget's ancestor in its dispose() method, + // save a reference to the ancestor by calling dependOnInheritedWidgetOfExactType() + // in the widget's didChangeDependencies() method. ScaffoldMessenger.of(context).hideCurrentSnackBar(); } ), diff --git a/lib/ctrl/application_def.dart b/lib/ctrl/application_def.dart new file mode 100755 index 0000000..4199517 --- /dev/null +++ b/lib/ctrl/application_def.dart @@ -0,0 +1,17 @@ +abstract class IApplicationProcess { + Future start(); + Future stop(); + Future syncState(); + bool isDead(); + String getName(); + String getPlatform(); + List getCmd(); + Map getEnv(); +} + +abstract class IApplication { + IApplicationProcess startProcess(String name, String platform, List cmd, Map env); + void stopProcess(String name); + IApplicationProcess? getApp(String name); + void dispose(); +} \ No newline at end of file diff --git a/lib/ctrl/application.dart b/lib/ctrl/application_local.dart similarity index 79% rename from lib/ctrl/application.dart rename to lib/ctrl/application_local.dart index e2092c9..60325a7 100755 --- a/lib/ctrl/application.dart +++ b/lib/ctrl/application_local.dart @@ -2,9 +2,11 @@ import 'dart:async'; +import './application_def.dart'; + import '../util/api.dart'; -class ApplicationProcess { +class ApplicationProcess implements IApplicationProcess { ApplicationProcess({ required this.name, required this.cmd, @@ -18,14 +20,26 @@ class ApplicationProcess { String platform; String state = "new"; + @override + String getName() => name; + @override + String getPlatform() => platform; + @override + List getCmd() => cmd; + @override + Map getEnv() => env; + + @override Future start() async { await NodeBaseApi.apiAppStart(name, cmd, env: env); } + @override Future stop() async { await NodeBaseApi.apiAppStop(name); } + @override Future syncState() async { final obj = await NodeBaseApi.apiAppStatus(name); final r = obj["state"]; @@ -33,13 +47,14 @@ class ApplicationProcess { return r; } + @override bool isDead() => state == "dead"; } -class Application { +class ApplicationLocal implements IApplication { late StreamSubscription listener; - Application({ + ApplicationLocal({ required this.baseDir }) { _connect(); @@ -59,6 +74,7 @@ class Application { }); } + @override ApplicationProcess startProcess( String name, String platform, @@ -74,6 +90,7 @@ class Application { return app; } + @override void stopProcess(String name) { final app = runtime[name]; if (app == null) return; @@ -81,6 +98,7 @@ class Application { app.stop(); } + @override ApplicationProcess? getApp(String name) => runtime[name]; List getRunningApp() { final List r = []; @@ -90,6 +108,7 @@ class Application { return r; } + @override void dispose() { listener.cancel(); runtime.forEach((_, app) => app.stop()); diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index b24779a..417d36d 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -1,8 +1,12 @@ import 'dart:developer'; import 'dart:io'; -import '../ctrl/application.dart'; -import '../ctrl/platform.dart'; + + +import '../ctrl/application_def.dart'; +import '../ctrl/application_local.dart'; +import '../ctrl/platform_def.dart'; +import '../ctrl/platform_local.dart'; import '../util/fs.dart'; import '../util/api.dart'; import '../util/event.dart' as event; @@ -11,8 +15,8 @@ const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2githu //const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; class NodeBaseController { - late Application application; - late Platform platform; + late IApplication application; + late IPlatform platform; bool isSupported = false; Future initializeApp() async { @@ -22,8 +26,8 @@ class NodeBaseController { final appBaseDir = await fsGetBaseDir(); var baseUrl = defaultPlatformBaseUrl; // TODO: read app config and get default base url - platform = Platform(baseUrl: baseUrl, baseDir: appBaseDir, os: os, arch: arch); - application = Application(baseDir: appBaseDir); + platform = PlatformLocal(baseUrl: baseUrl, baseDir: appBaseDir, os: os, arch: arch); + application = ApplicationLocal(baseDir: appBaseDir); try { // TODO: read user settings, app list, platform list // get latest app, platform list from remote diff --git a/lib/ctrl/platform_def.dart b/lib/ctrl/platform_def.dart new file mode 100755 index 0000000..3bd7483 --- /dev/null +++ b/lib/ctrl/platform_def.dart @@ -0,0 +1,36 @@ +import 'dart:async'; + +abstract class IPlatform { + void changeBaseUrl(String url); + Future isSupported(); + String getName(); + String getNodeBaseJsonFilename(); + String getApplicationListJsonFilename(); + String getPlatformListJsonFilename(); + Future getApplicationBaseDir(String name, String version); + Future getPlatformBaseDir(String name, String version); + Future> readNodeBaseJson(); + Future> readApplicationListJson(); + Future> readPlatformListJson(); + Future> readApplicationMetaJson(String name, String version); + Future> readPlatformMetaJson(String name, String version); + Future downloadNodeBaseJson({StreamController? cancel}); + Future downloadApplicationListJson({StreamController? cancel}); + Future downloadPlatformListJson({StreamController? cancel}); + Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}); + Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}); + Future downloadApplicationBinary(String name, String version, String platform, String url, {StreamController? cancel}); + Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}); + Future downloadCancel(String targetFilename); + Future>> listAvailableApplicationList(); + Future>> listInstalledApplicationList(); + Future> readApplicationConfig(String name, String version); + Future writeApplicationConfig(String name, String version, Map json); + Future removeApplicationBinary(String name, String version, String platform); + Future>> listAvailablePlatformList(); + Future>> listInstalledPlatformList(); + Future> listPlatformExecutableList(String name, String version); + Future> readPlatformConfig(String name, String version); + Future writePlatformConfig(String name, String version, Map json); + Future removePlatformBinary(String name, String version); +} \ No newline at end of file diff --git a/lib/ctrl/platform.dart b/lib/ctrl/platform_local.dart similarity index 94% rename from lib/ctrl/platform.dart rename to lib/ctrl/platform_local.dart index bccf424..326a409 100755 --- a/lib/ctrl/platform.dart +++ b/lib/ctrl/platform_local.dart @@ -4,6 +4,7 @@ import 'dart:async'; import 'dart:io'; import 'package:path/path.dart' as path; +import './platform_def.dart'; import '../util/api.dart'; import '../util/fs.dart'; import '../util/event.dart' as event; @@ -85,8 +86,8 @@ class _DownloadItem { final StreamController cancel; } -class Platform { - Platform({ +class PlatformLocal implements IPlatform { + PlatformLocal({ required this.baseUrl, required this.baseDir, required this.os, @@ -98,36 +99,50 @@ class Platform { final Map _downloadQueue = {}; + @override + String getName() => "$os-$arch"; + String _getEtcBaseDir() => path.join(baseDir, "workspace", "etc"); String _getTmpBaseDir() => path.join(baseDir, "workspace", "tmp"); String _getApplicationBaseDir() => path.join(baseDir, "workspace", "app"); String _getPlatformBaseDir() => path.join(baseDir, "workspace", "plm"); + @override String getNodeBaseJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); + @override String getApplicationListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); + @override String getPlatformListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); + @override void changeBaseUrl(String url) { baseUrl = url; } Future isSupported() async { final config = await readNodeBaseJson(); return config.containsKey("platform-$os-$arch"); } + @override Future getApplicationBaseDir(String name, String version) async { return path.join(_getApplicationBaseDir(), await fsCalcStringHash("$name-$version")); } + @override Future getPlatformBaseDir(String name, String version) async { return path.join(_getPlatformBaseDir(), await fsCalcStringHash("$name-$version")); } + @override Future> readNodeBaseJson() async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "nodebase.json")); + @override Future> readApplicationListJson() async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json")); + @override Future> readPlatformListJson() async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json")); + @override Future> readApplicationMetaJson(String name, String version) async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "app", await fsCalcStringHash("$name-$version"), "meta.json")); + @override Future> readPlatformMetaJson(String name, String version) async => fsReadFileAsJson(path.join(_getEtcBaseDir(), "plm", await fsCalcStringHash("$name-$version"), "meta.json")); @@ -156,6 +171,7 @@ class Platform { }); return download; } + @override Future downloadNodeBaseJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "nodebase.json"); final doing = _downloadQueue[tmpFilename]; @@ -177,6 +193,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadApplicationListJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "app-$os-$arch.json"); final doing = _downloadQueue[tmpFilename]; @@ -198,6 +215,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadPlatformListJson({StreamController? cancel}) async { final tmpFilename = path.join(_getTmpBaseDir(), "plm-$os-$arch.json"); final doing = _downloadQueue[tmpFilename]; @@ -219,6 +237,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}) async { // python3 -c 'from hashlib import sha256; x="node-v20.11.0";print(x, sha256(x.encode("utf-8")).hexdigest())' final hash = await fsCalcStringHash("$name-$version"); @@ -242,6 +261,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final tmpFilename = path.join(_getTmpBaseDir(), "plm-$hash-meta.json"); @@ -264,6 +284,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadApplicationBinary(String name, String version, String platform, String url, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final baseName = path.basename(url); @@ -305,6 +326,7 @@ class Platform { _downloadQueue.remove(tmpFilename); } } + @override Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}) async { final hash = await fsCalcStringHash("$name-$version"); final baseName = path.basename(url); @@ -350,8 +372,9 @@ class Platform { _downloadQueue.remove(tmpFilename); } } - Future downloadCancel(String targeFilename) async { - final doing = _downloadQueue[targeFilename]; + @override + Future downloadCancel(String targetFilename) async { + final doing = _downloadQueue[targetFilename]; if (doing == null) return; doing.cancel.add(true); await doing.action.future; @@ -387,6 +410,7 @@ class Platform { await fsWriteFileAsJson(filename, config); } + @override Future>> listAvailableApplicationList() async { // name-version:platform final filename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); @@ -405,6 +429,7 @@ class Platform { } return r; } + @override Future>> listInstalledApplicationList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "app-list.json"); final config = await fsReadFileAsJson(filename); @@ -422,16 +447,19 @@ class Platform { } return r; } + @override Future> readApplicationConfig(String name, String version) async { final hash = await fsCalcStringHash("$name-$version"); final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); return await fsReadFileAsJson(filename); } + @override Future writeApplicationConfig(String name, String version, Map json) async { final hash = await fsCalcStringHash("$name-$version"); final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); await fsWriteFileAsJson(filename, json); } + @override Future removeApplicationBinary(String name, String version, String platform) async { final hash = await fsCalcStringHash("$name-$version"); final dir = Directory(path.join(_getApplicationBaseDir(), hash)); @@ -440,6 +468,7 @@ class Platform { await dir.delete(recursive: true); } + @override Future>> listAvailablePlatformList() async { final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); final config = await fsReadFileAsJson(filename); @@ -457,6 +486,7 @@ class Platform { } return r; } + @override Future>> listInstalledPlatformList() async { // name-version final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); @@ -475,6 +505,7 @@ class Platform { } return r; } + @override Future> listPlatformExecutableList(String name, String version) async { final meta = await readPlatformMetaJson(name, version); List r = []; @@ -483,16 +514,19 @@ class Platform { } return r; } + @override Future> readPlatformConfig(String name, String version) async { final hash = await fsCalcStringHash("$name-$version"); final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); return await fsReadFileAsJson(filename); } + @override Future writePlatformConfig(String name, String version, Map json) async { final hash = await fsCalcStringHash("$name-$version"); final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); await fsWriteFileAsJson(filename, json); } + @override Future removePlatformBinary(String name, String version) async { final hash = await fsCalcStringHash("$name-$version"); final dir = Directory(path.join(_getPlatformBaseDir(), hash)); diff --git a/lib/page/not_supported.dart b/lib/page/not_supported.dart index 2066926..e5cddd4 100755 --- a/lib/page/not_supported.dart +++ b/lib/page/not_supported.dart @@ -43,7 +43,7 @@ class _NotSupportedPageState extends State { style: TextStyle(color: Color.fromARGB(128, 0, 0, 0)), ), Text( - "\"${nodebase.instance.platform.os} ${nodebase.instance.platform.arch}\"", + "\"${nodebase.instance.platform.getName()}\"", style: const TextStyle(color: Color.fromARGB(255, 255, 128, 128)), ), ], diff --git a/lib/page/primay.dart b/lib/page/primay.dart index a328016..bff9cf2 100755 --- a/lib/page/primay.dart +++ b/lib/page/primay.dart @@ -35,8 +35,8 @@ class _PrimaryPageState extends State { plmRef["${one.name}-${one.version}"] = 0; } for (final one in runtimeList) { - appRef[one.process.name] = (appRef[one.process.name] ?? 0) + 1; - plmRef[one.process.platform] = (plmRef[one.process.name] ?? 0) + 1; + appRef[one.process.getName()] = (appRef[one.process.getName()] ?? 0) + 1; + plmRef[one.process.getPlatform()] = (plmRef[one.process.getName()] ?? 0) + 1; } for (int i = 0, n = appList.length; i < n; i++) { final one = appList[i]; @@ -118,7 +118,7 @@ class _PrimaryPageState extends State { final app = nodebase.instance.application.getApp(nameVersion); AppRuntimeTile? tile; try { - tile = runtimeList.firstWhere((one) => one.process == app || one.process.name == nameVersion); + tile = runtimeList.firstWhere((one) => one.process == app || one.process.getName() == nameVersion); } catch(err) { tile = null; } From aee8af255f2c2f5c01994bf635fa07dceca0f470 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 11:15:06 +0800 Subject: [PATCH 113/125] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f2a6a10 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright NodeBase with all contributors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From bdbf085c59f68858e484a0096e3425d00d991d8e Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 11:28:03 +0800 Subject: [PATCH 114/125] dart: define configuration for future use - move platform base url into it - reserve localMode to switch between local and remote mode --- lib/ctrl/configure.dart | 4 ++++ lib/ctrl/nodebase.dart | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 lib/ctrl/configure.dart diff --git a/lib/ctrl/configure.dart b/lib/ctrl/configure.dart new file mode 100755 index 0000000..9382194 --- /dev/null +++ b/lib/ctrl/configure.dart @@ -0,0 +1,4 @@ +bool localMode = true; + +String defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; +//String defaultPlatformBaseUrl = "http://127.0.0.1:8000"; diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart index 417d36d..28e13e5 100755 --- a/lib/ctrl/nodebase.dart +++ b/lib/ctrl/nodebase.dart @@ -1,8 +1,6 @@ import 'dart:developer'; import 'dart:io'; - - import '../ctrl/application_def.dart'; import '../ctrl/application_local.dart'; import '../ctrl/platform_def.dart'; @@ -10,9 +8,7 @@ import '../ctrl/platform_local.dart'; import '../util/fs.dart'; import '../util/api.dart'; import '../util/event.dart' as event; - -const defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; -//const defaultPlatformBaseUrl = "http://127.0.0.1:8000"; +import './configure.dart'; class NodeBaseController { late IApplication application; @@ -20,6 +16,16 @@ class NodeBaseController { bool isSupported = false; Future initializeApp() async { + if (localMode) { + await initLocalMode(); + } else { + // TODO: add PlatformRemote and ApplicationRemote for remote mode + } + + event.initializeToken.add(true); + } + + Future initLocalMode() async { final parts = (await NodeBaseApi.apiUtilGetArch()).split("|")[0].split("-"); String os = parts[0]; String arch = parts[1]; @@ -57,9 +63,8 @@ class NodeBaseController { } catch(e) { log("NodeBase [E] cannot download plm-list.json"); } - - event.initializeToken.add(true); } + } final instance = NodeBaseController(); \ No newline at end of file From 941f0a99589512d711cb4a1b40194bfee50051af Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 11:36:10 +0800 Subject: [PATCH 115/125] dart: minor - add comment for long path file removing on windows --- lib/ctrl/platform_local.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ctrl/platform_local.dart b/lib/ctrl/platform_local.dart index 326a409..8cf472f 100755 --- a/lib/ctrl/platform_local.dart +++ b/lib/ctrl/platform_local.dart @@ -534,6 +534,7 @@ class PlatformLocal implements IPlatform { if (!dir.existsSync()) return; // XXX: by default, on windows, MAX_PATh = 260, if too long, will fail // ref: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry + // ref: https://stackoverflow.com/questions/3277717/c-winapi-handling-long-file-paths-names (prefix \\?\) await dir.delete(recursive: true); } } From ea21fc84ea0d12f5392de44fd0f3b8f9e5aa4926 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 16:07:56 +0800 Subject: [PATCH 116/125] dart: make ApplicationProcess private with _ ahead - it does not need to know the implementation outside therefore, mark ApplicationProcess private --- lib/ctrl/application_def.dart | 1 + lib/ctrl/application_local.dart | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/ctrl/application_def.dart b/lib/ctrl/application_def.dart index 4199517..957a93c 100755 --- a/lib/ctrl/application_def.dart +++ b/lib/ctrl/application_def.dart @@ -13,5 +13,6 @@ abstract class IApplication { IApplicationProcess startProcess(String name, String platform, List cmd, Map env); void stopProcess(String name); IApplicationProcess? getApp(String name); + List getRunningApp(); void dispose(); } \ No newline at end of file diff --git a/lib/ctrl/application_local.dart b/lib/ctrl/application_local.dart index 60325a7..0f4a701 100755 --- a/lib/ctrl/application_local.dart +++ b/lib/ctrl/application_local.dart @@ -6,8 +6,8 @@ import './application_def.dart'; import '../util/api.dart'; -class ApplicationProcess implements IApplicationProcess { - ApplicationProcess({ +class _ApplicationProcess implements IApplicationProcess { + _ApplicationProcess({ required this.name, required this.cmd, this.platform = "-", @@ -66,7 +66,7 @@ class ApplicationLocal implements IApplication { final name = message[0]; final state = message[1]; final app = runtime[name]; - if (app != null) { + if (app != null && app is _ApplicationProcess) { app.state = state; if (state == "dead") runtime.remove(name); } @@ -75,13 +75,13 @@ class ApplicationLocal implements IApplication { } @override - ApplicationProcess startProcess( + IApplicationProcess startProcess( String name, String platform, List cmd, Map env ) { - final app = ApplicationProcess(name: name, cmd: cmd, env: env, platform: platform); + final app = _ApplicationProcess(name: name, cmd: cmd, env: env, platform: platform); // XXX: if we want sandbox to run applications, // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl // on Linux, Android, consider proot @@ -99,9 +99,10 @@ class ApplicationLocal implements IApplication { } @override - ApplicationProcess? getApp(String name) => runtime[name]; - List getRunningApp() { - final List r = []; + IApplicationProcess? getApp(String name) => runtime[name]; + @override + List getRunningApp() { + final List r = []; runtime.forEach((name, app) { if (!app.isDead()) r.add(app); }); @@ -115,5 +116,5 @@ class ApplicationLocal implements IApplication { } String baseDir; - Map runtime = {}; + Map runtime = {}; } \ No newline at end of file From 097ee790ca11cf1cd6033257df13eff1c5f46286 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 20:51:51 +0800 Subject: [PATCH 117/125] dart: reserve defaultRemoteBaseUrl for remote mode --- lib/ctrl/configure.dart | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/ctrl/configure.dart b/lib/ctrl/configure.dart index 9382194..67c632e 100755 --- a/lib/ctrl/configure.dart +++ b/lib/ctrl/configure.dart @@ -1,4 +1,28 @@ bool localMode = true; +/* + * /nodebase.json + * /plm--.json + * /plm///(-).json + * /app--.json + * /app///(-).json + */ String defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; //String defaultPlatformBaseUrl = "http://127.0.0.1:8000"; + +/* + * /app/running GET + * /app/start POST + * /app/stop POST + * /app/stat GET + * /config/nodebase GET + * /config/list/plm GET + * /config/list/installed_plm GET + * /config/install/plm/ POST + * /config/meta/plm/ GET + * /config/list/app GET + * /config/list/installed_app GET + * /config/install/app/ POST + * /config/meta/app/ GET + */ +String defaultRemoteBaseUrl = "http://127.0.0.1:8580"; \ No newline at end of file From 96ebd0b23a25cfef9cc293496af1620473bea8b6 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Fri, 29 Mar 2024 20:52:34 +0800 Subject: [PATCH 118/125] dart: add a remote lib to handle http requests --- lib/util/remote.dart | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 lib/util/remote.dart diff --git a/lib/util/remote.dart b/lib/util/remote.dart new file mode 100755 index 0000000..f5ca3bc --- /dev/null +++ b/lib/util/remote.dart @@ -0,0 +1,40 @@ +import 'dart:convert'; +import 'dart:io'; + +Future?> remoteGet(String url) async { + HttpClient client = HttpClient(); + try { + final req = await client.getUrl(Uri.parse(url)); + final response = await req.close(); + if (response.statusCode / 200 == 2) { + final stream = await response.transform(utf8.decoder).toList(); + final ret = jsonDecode(stream.first) as Map; + return ret; + } + throw "request failure"; + } catch (e) { + return null; + } finally { + client.close(); + } +} + +Future?> remotePost(String url, Map data) async { + HttpClient client = HttpClient(); + try { + final req = await client.postUrl(Uri.parse(url)); + req.headers.set("Content-Type", "application/json"); + req.write(data); + final response = await req.close(); + if (response.statusCode / 200 == 2) { + final stream = await response.transform(utf8.decoder).toList(); + final ret = jsonDecode(stream.first) as Map; + return ret; + } + throw "request failure"; + } catch (e) { + return null; + } finally { + client.close(); + } +} \ No newline at end of file From 4bbed4502ffadfc4b8aea755a8bad9a9b4f080d3 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 3 Feb 2026 23:15:45 +0800 Subject: [PATCH 119/125] start from zero, remove all flutter and kotlin code, redesign --- analysis_options.yaml | 28 - android/.gitignore | 13 - android/app/build.gradle | 57 -- android/app/src/debug/AndroidManifest.xml | 7 - android/app/src/main/AndroidManifest.xml | 51 -- .../nodebase/nodebase/ChannelResult.java | 6 - .../net/seven/nodebase/nodebase/Command.java | 39 - .../net/seven/nodebase/nodebase/External.java | 82 --- .../nodebase/ForegroundNodeService.java | 82 --- .../net/seven/nodebase/nodebase/Logger.java | 21 - .../seven/nodebase/nodebase/MainActivity.java | 164 ----- .../net/seven/nodebase/nodebase/Network.java | 46 -- .../nodebase/nodebase/NodeAppMonitor.java | 234 ------ .../nodebase/nodebase/NodeAppService.java | 67 -- .../net/seven/nodebase/nodebase/NodeBase.java | 4 - .../nodebase/NodeBaseEventHandler.java | 30 - .../res/drawable-v21/launch_background.xml | 12 - .../main/res/drawable/launch_background.xml | 12 - .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 0 bytes .../app/src/main/res/values-night/styles.xml | 18 - android/app/src/main/res/values/styles.xml | 18 - android/app/src/profile/AndroidManifest.xml | 7 - android/build.gradle | 30 - android/gradle.properties | 6 - .../gradle/wrapper/gradle-wrapper.properties | 5 - android/settings.gradle | 29 - asset/image/logo.png | Bin 3173 -> 0 bytes ios/.gitignore | 34 - ios/Flutter/AppFrameworkInfo.plist | 26 - ios/Flutter/Debug.xcconfig | 1 - ios/Flutter/Release.xcconfig | 1 - ios/Runner.xcodeproj/project.pbxproj | 609 --------------- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 98 --- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 - ios/Runner/AppDelegate.h | 6 - ios/Runner/AppDelegate.m | 13 - .../AppIcon.appiconset/Contents.json | 122 --- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 295 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 450 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 282 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 462 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 704 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 406 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 586 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 862 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 1674 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 762 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 1226 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 1418 -> 0 bytes .../LaunchImage.imageset/Contents.json | 23 - .../LaunchImage.imageset/LaunchImage.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 68 -> 0 bytes .../LaunchImage.imageset/README.md | 5 - ios/Runner/Base.lproj/LaunchScreen.storyboard | 37 - ios/Runner/Base.lproj/Main.storyboard | 26 - ios/Runner/Info.plist | 49 -- ios/Runner/main.m | 9 - ios/RunnerTests/RunnerTests.m | 16 - lib/comp/app_runtime_tile.dart | 95 --- lib/comp/app_tile.dart | 212 ------ lib/comp/download_tile.dart | 137 ---- lib/comp/platform_tile.dart | 183 ----- lib/comp/run_app_steps.dart | 527 ------------- lib/comp/util.dart | 44 -- lib/ctrl/application_def.dart | 18 - lib/ctrl/application_local.dart | 120 --- lib/ctrl/configure.dart | 28 - lib/ctrl/nodebase.dart | 70 -- lib/ctrl/platform_def.dart | 36 - lib/ctrl/platform_local.dart | 540 -------------- lib/main.dart | 38 - lib/page/not_supported.dart | 71 -- lib/page/primay.dart | 362 --------- lib/page/splash.dart | 88 --- lib/util/api.dart | 106 --- lib/util/event.dart | 4 - lib/util/fs.dart | 352 --------- lib/util/remote.dart | 40 - linux/.gitignore | 1 - linux/CMakeLists.txt | 145 ---- linux/flutter/CMakeLists.txt | 88 --- linux/flutter/flutter_dart.h | 463 ------------ linux/flutter/generated_plugin_registrant.cc | 11 - linux/flutter/generated_plugin_registrant.h | 15 - linux/flutter/generated_plugins.cmake | 23 - linux/main.cc | 6 - linux/my_application.cc | 108 --- linux/my_application.h | 18 - macos/.gitignore | 7 - macos/Flutter/Flutter-Debug.xcconfig | 1 - macos/Flutter/Flutter-Release.xcconfig | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 10 - macos/Runner.xcodeproj/project.pbxproj | 695 ------------------ .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/Runner.xcscheme | 98 --- .../contents.xcworkspacedata | 7 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - macos/Runner/AppDelegate.swift | 9 - .../AppIcon.appiconset/Contents.json | 68 -- .../AppIcon.appiconset/app_icon_1024.png | Bin 102994 -> 0 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 5680 -> 0 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 520 -> 0 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 14142 -> 0 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 1066 -> 0 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 36406 -> 0 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 2218 -> 0 bytes macos/Runner/Base.lproj/MainMenu.xib | 343 --------- macos/Runner/Configs/AppInfo.xcconfig | 14 - macos/Runner/Configs/Debug.xcconfig | 2 - macos/Runner/Configs/Release.xcconfig | 2 - macos/Runner/Configs/Warnings.xcconfig | 13 - macos/Runner/DebugProfile.entitlements | 12 - macos/Runner/Info.plist | 32 - macos/Runner/MainFlutterWindow.swift | 15 - macos/Runner/Release.entitlements | 8 - macos/RunnerTests/RunnerTests.swift | 12 - pubspec.lock | 273 ------- pubspec.yaml | 98 --- test/util_fs_test.dart | 14 - test/widget_test.dart | 30 - web/favicon.png | Bin 917 -> 0 bytes web/icons/Icon-192.png | Bin 5292 -> 0 bytes web/icons/Icon-512.png | Bin 8252 -> 0 bytes web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes web/index.html | 59 -- web/manifest.json | 35 - windows/.gitignore | 17 - windows/CMakeLists.txt | 108 --- windows/flutter/CMakeLists.txt | 109 --- .../flutter/generated_plugin_registrant.cc | 11 - windows/flutter/generated_plugin_registrant.h | 15 - windows/flutter/generated_plugins.cmake | 23 - windows/runner/CMakeLists.txt | 40 - windows/runner/Runner.rc | 121 --- windows/runner/flutter_dart.h | 521 ------------- windows/runner/flutter_window.cpp | 82 --- windows/runner/flutter_window.h | 33 - windows/runner/main.cpp | 43 -- windows/runner/resource.h | 16 - windows/runner/resources/app_icon.ico | Bin 33772 -> 0 bytes windows/runner/runner.exe.manifest | 21 - windows/runner/utils.cpp | 112 --- windows/runner/utils.h | 20 - windows/runner/win32_window.cpp | 288 -------- windows/runner/win32_window.h | 102 --- 159 files changed, 9694 deletions(-) delete mode 100755 analysis_options.yaml delete mode 100755 android/.gitignore delete mode 100755 android/app/build.gradle delete mode 100755 android/app/src/debug/AndroidManifest.xml delete mode 100755 android/app/src/main/AndroidManifest.xml delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/ChannelResult.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/Command.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/External.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/Logger.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/Network.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/NodeBase.java delete mode 100755 android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java delete mode 100755 android/app/src/main/res/drawable-v21/launch_background.xml delete mode 100755 android/app/src/main/res/drawable/launch_background.xml delete mode 100755 android/app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100755 android/app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100755 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100755 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100755 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100755 android/app/src/main/res/values-night/styles.xml delete mode 100755 android/app/src/main/res/values/styles.xml delete mode 100755 android/app/src/profile/AndroidManifest.xml delete mode 100755 android/build.gradle delete mode 100755 android/gradle.properties delete mode 100755 android/gradle/wrapper/gradle-wrapper.properties delete mode 100755 android/settings.gradle delete mode 100644 asset/image/logo.png delete mode 100755 ios/.gitignore delete mode 100755 ios/Flutter/AppFrameworkInfo.plist delete mode 100755 ios/Flutter/Debug.xcconfig delete mode 100755 ios/Flutter/Release.xcconfig delete mode 100755 ios/Runner.xcodeproj/project.pbxproj delete mode 100755 ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100755 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100755 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100755 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100755 ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100755 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100755 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings delete mode 100755 ios/Runner/AppDelegate.h delete mode 100755 ios/Runner/AppDelegate.m delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json delete mode 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png delete mode 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png delete mode 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png delete mode 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md delete mode 100755 ios/Runner/Base.lproj/LaunchScreen.storyboard delete mode 100755 ios/Runner/Base.lproj/Main.storyboard delete mode 100755 ios/Runner/Info.plist delete mode 100755 ios/Runner/main.m delete mode 100755 ios/RunnerTests/RunnerTests.m delete mode 100755 lib/comp/app_runtime_tile.dart delete mode 100755 lib/comp/app_tile.dart delete mode 100755 lib/comp/download_tile.dart delete mode 100755 lib/comp/platform_tile.dart delete mode 100755 lib/comp/run_app_steps.dart delete mode 100755 lib/comp/util.dart delete mode 100755 lib/ctrl/application_def.dart delete mode 100755 lib/ctrl/application_local.dart delete mode 100755 lib/ctrl/configure.dart delete mode 100755 lib/ctrl/nodebase.dart delete mode 100755 lib/ctrl/platform_def.dart delete mode 100755 lib/ctrl/platform_local.dart delete mode 100755 lib/main.dart delete mode 100755 lib/page/not_supported.dart delete mode 100755 lib/page/primay.dart delete mode 100755 lib/page/splash.dart delete mode 100755 lib/util/api.dart delete mode 100755 lib/util/event.dart delete mode 100755 lib/util/fs.dart delete mode 100755 lib/util/remote.dart delete mode 100755 linux/.gitignore delete mode 100755 linux/CMakeLists.txt delete mode 100755 linux/flutter/CMakeLists.txt delete mode 100755 linux/flutter/flutter_dart.h delete mode 100755 linux/flutter/generated_plugin_registrant.cc delete mode 100755 linux/flutter/generated_plugin_registrant.h delete mode 100755 linux/flutter/generated_plugins.cmake delete mode 100755 linux/main.cc delete mode 100755 linux/my_application.cc delete mode 100755 linux/my_application.h delete mode 100755 macos/.gitignore delete mode 100755 macos/Flutter/Flutter-Debug.xcconfig delete mode 100755 macos/Flutter/Flutter-Release.xcconfig delete mode 100755 macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100755 macos/Runner.xcodeproj/project.pbxproj delete mode 100755 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100755 macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme delete mode 100755 macos/Runner.xcworkspace/contents.xcworkspacedata delete mode 100755 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100755 macos/Runner/AppDelegate.swift delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png delete mode 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png delete mode 100755 macos/Runner/Base.lproj/MainMenu.xib delete mode 100755 macos/Runner/Configs/AppInfo.xcconfig delete mode 100755 macos/Runner/Configs/Debug.xcconfig delete mode 100755 macos/Runner/Configs/Release.xcconfig delete mode 100755 macos/Runner/Configs/Warnings.xcconfig delete mode 100755 macos/Runner/DebugProfile.entitlements delete mode 100755 macos/Runner/Info.plist delete mode 100755 macos/Runner/MainFlutterWindow.swift delete mode 100755 macos/Runner/Release.entitlements delete mode 100755 macos/RunnerTests/RunnerTests.swift delete mode 100755 pubspec.lock delete mode 100755 pubspec.yaml delete mode 100755 test/util_fs_test.dart delete mode 100755 test/widget_test.dart delete mode 100755 web/favicon.png delete mode 100755 web/icons/Icon-192.png delete mode 100755 web/icons/Icon-512.png delete mode 100755 web/icons/Icon-maskable-192.png delete mode 100755 web/icons/Icon-maskable-512.png delete mode 100755 web/index.html delete mode 100755 web/manifest.json delete mode 100755 windows/.gitignore delete mode 100755 windows/CMakeLists.txt delete mode 100755 windows/flutter/CMakeLists.txt delete mode 100755 windows/flutter/generated_plugin_registrant.cc delete mode 100755 windows/flutter/generated_plugin_registrant.h delete mode 100755 windows/flutter/generated_plugins.cmake delete mode 100755 windows/runner/CMakeLists.txt delete mode 100755 windows/runner/Runner.rc delete mode 100755 windows/runner/flutter_dart.h delete mode 100755 windows/runner/flutter_window.cpp delete mode 100755 windows/runner/flutter_window.h delete mode 100755 windows/runner/main.cpp delete mode 100755 windows/runner/resource.h delete mode 100755 windows/runner/resources/app_icon.ico delete mode 100755 windows/runner/runner.exe.manifest delete mode 100755 windows/runner/utils.cpp delete mode 100755 windows/runner/utils.h delete mode 100755 windows/runner/win32_window.cpp delete mode 100755 windows/runner/win32_window.h diff --git a/analysis_options.yaml b/analysis_options.yaml deleted file mode 100755 index d4e0f0c..0000000 --- a/analysis_options.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at https://dart.dev/lints. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100755 index 5d99765..0000000 --- a/android/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java - -# Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties -**/*.keystore -**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100755 index 068c3ae..0000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -plugins { - id "com.android.application" - id "kotlin-android" - id "dev.flutter.flutter-gradle-plugin" -} - -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -android { - namespace "net.seven.nodebase.nodebase" - compileSdk 33 - ndkVersion flutter.ndkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "net.seven.nodebase.nodebase" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 26 - targetSdkVersion 28 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml deleted file mode 100755 index 8ffe024..0000000 --- a/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml deleted file mode 100755 index a6b5ed6..0000000 --- a/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/ChannelResult.java b/android/app/src/main/java/net/seven/nodebase/nodebase/ChannelResult.java deleted file mode 100755 index f661a24..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/ChannelResult.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.seven.nodebase.nodebase; - -public enum ChannelResult { - OK, - FAILED -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/Command.java b/android/app/src/main/java/net/seven/nodebase/nodebase/Command.java deleted file mode 100755 index 24ee694..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/Command.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.seven.nodebase.nodebase; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.ArrayList; - -public class Command { - public static String checkOutput(String[] cmd) { - return checkOutput(cmd, false); - } - public static String checkOutput(String[] cmd, boolean joinStderr) { - try { - ProcessBuilder build = new ProcessBuilder(cmd); - if (joinStderr) build.redirectErrorStream(true); - Process p = build.start(); - BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())); - StringBuilder sb = new StringBuilder(); - String line; - while ((line = reader.readLine()) != null) { - sb.append(line); - sb.append('\n'); - } - p.waitFor(); - reader.close(); - return sb.toString().substring(0, sb.length() - 1); - } catch(Exception e) { - Logger.d( - "NodeBase", - "command", - String.format( - "%s :: %s", - String.join(" ", cmd), - e.toString() - ) - ); - return null; - } - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java b/android/app/src/main/java/net/seven/nodebase/nodebase/External.java deleted file mode 100755 index fabcc37..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/External.java +++ /dev/null @@ -1,82 +0,0 @@ -package net.seven.nodebase.nodebase; - -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Build; - -import java.io.File; -import java.util.ArrayList; - -public class External { - public static void openBrowser(Context context, String url) { - Intent it = new Intent(Intent.ACTION_SEND); - it.setAction("android.intent.action.VIEW"); - it.setData(Uri.parse(url)); - context.startActivity(it); - } - - private static String transformAbiToArch(String name) { - switch(name) { - case "armeabi-v8a": case "arm64-v8a": return "arm64"; - case "x86_64": return "x64"; - case "x86": return "x86"; - case "armeabi-v7a": case "armeabi": return "arm"; - // mips, mips64 - } - return "unknown:" + name; - } - public static String getArch() { - ArrayList arch = new ArrayList<>(); - StringBuilder sb = new StringBuilder(); - sb.append("android-"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - for (String one : Build.SUPPORTED_ABIS) { - arch.add(transformAbiToArch(one)); - } - sb.append(String.join("|", arch)); - } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) { - // deprecated api - sb.append(transformAbiToArch(Build.CPU_ABI)); - sb.append('|'); - sb.append(transformAbiToArch(Build.CPU_ABI2)); - } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.DONUT) { - // deprecated api - sb.append(Build.CPU_ABI); - } - return sb.toString(); - } - - public static void shareInformation( - Context context, - String title, - String subtitle, - String text - ) { - shareInformation(context, title, subtitle, text, null); - } - public static void shareInformation( - Context context, - String title, - String subtitle, - String text, - String imgFilePath - ) { - Intent it = new Intent(Intent.ACTION_SEND); - if (imgFilePath == null || imgFilePath.length() == 0) { - it.setType("text/plain"); - } else { - File f = new File(imgFilePath); - if (f.exists() && f.isFile()) { - it.setType("image/jpg"); - it.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(f)); - } else { - it.setType("text/plain"); - } - } - if (subtitle != null) it.putExtra(Intent.EXTRA_SUBJECT, subtitle); - if (text != null) it.putExtra(Intent.EXTRA_TEXT, text); - it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(Intent.createChooser(it, title)); - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java b/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java deleted file mode 100755 index 5b48b6d..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/ForegroundNodeService.java +++ /dev/null @@ -1,82 +0,0 @@ -package net.seven.nodebase.nodebase; - -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.Service; -import android.content.Context; -import android.content.Intent; -import android.os.Build; -import android.os.IBinder; - -import androidx.core.app.NotificationCompat; - -public class ForegroundNodeService extends Service { - private static final String CHANNEL_ID = "net.seven.nodebase.foregroundservice"; - public static final String ARGV = "NodeService"; - - private Thread watchDog; - - public ForegroundNodeService() { } - - private void registerNotificationItem() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel srvChannel = new NotificationChannel( - CHANNEL_ID, - "NodeBase Service", - NotificationManager.IMPORTANCE_DEFAULT - ); - NotificationManager manager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE); - manager.createNotificationChannel(srvChannel); - } - - Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("NodeBase") - .setContentText("application nodebase service running ...") - .build(); - startForeground(1, notification); - - watchDog = new Thread(new Runnable() { - @Override - public void run() { - Intent it = new Intent( - ForegroundNodeService.this.getApplicationContext(), - ForegroundNodeService.class - ); - while(true) { - int count = NodeAppService.getRunningNodeAppCount(); - if (count <= 0) break; - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - break; - } - }; - ForegroundNodeService.this.stopService(it); - } - }); - watchDog.start(); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - registerNotificationItem(); - return Service.START_STICKY; - } - - @Override - public void onCreate() { - super.onCreate(); - } - - @Override - public void onDestroy() { - NodeAppService.stopNodeApps(); - super.onDestroy(); - } - - @Override - public IBinder onBind(Intent intent) { - return null; - } -} \ No newline at end of file diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/Logger.java b/android/app/src/main/java/net/seven/nodebase/nodebase/Logger.java deleted file mode 100755 index 762f0a8..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/Logger.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.seven.nodebase.nodebase; - -import android.util.Log; - -public class Logger { - public static void i(String tag, String sub, String message) { - Log.i(tag, String.format("[I] %s :: %s", sub, message)); - } - - public static void w(String tag, String sub, String message) { - Log.w(tag, String.format("[W] %s :: %s", sub, message)); - } - - public static void e(String tag, String sub, String message) { - Log.e(tag, String.format("[E] %s :: %s", sub, message)); - } - - public static void d(String tag, String sub, String message) { - Log.d(tag, String.format("[D] %s :: %s", sub, message)); - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java b/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java deleted file mode 100755 index 8b418fc..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/MainActivity.java +++ /dev/null @@ -1,164 +0,0 @@ -package net.seven.nodebase.nodebase; - -import android.content.Intent; - -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugin.common.EventChannel; -import io.flutter.plugin.common.MethodCall; -import io.flutter.plugin.common.MethodChannel; - -public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { - super.configureFlutterEngine(flutterEngine); - listenNodeAppChannel(flutterEngine); - } - - private void listenNodeAppChannel(@NonNull FlutterEngine flutterEngine) { - new MethodChannel( - flutterEngine.getDartExecutor().getBinaryMessenger(), - "net.seven.nodebase/app" - ).setMethodCallHandler(new MethodChannel.MethodCallHandler() { - @Override - public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) { - switch(call.method) { - case "app.start" -> { - String name = call.argument("name"); - ArrayList cmd = call.argument("cmd"); - HashMap env = call.argument("env"); - if (name == null || cmd == null || cmd.size() == 0) { - result.error("app.start", "empty name or cmd", null); - return; - } - if (startNodeApp(name, cmd, env) == ChannelResult.OK) { - result.success(true); - } else { - result.error("app.start", "internal error", null); - } - } - case "app.stop" -> { - String name = call.argument("name"); - if (name == null) { - result.error("app.stop", "empty name", null); - return; - } - if (stopNodeApp(name) == ChannelResult.OK) { - result.success(true); - } else { - result.error("app.stop", "internal error", null); - } - } - case "app.stat" -> { - String name = call.argument("name"); - if (name == null) { - result.error("app.stat", "empty name", null); - return; - } - var stat = getNodeAppStatus(name); - if (stat == null) { - result.error("app.stat", "no stat", null); - return; - } - result.success(stat); - } - case "util.ip" -> { - var ipJsonString = getIPs(); - result.success(ipJsonString); - } - case "util.browser.open" -> { - String url = call.argument("url"); - if (url == null) { - result.error("util.browser", "no url", null); - return; - } - External.openBrowser(MainActivity.this.getContext(), url); - result.success(true); - } - case "util.file.executable" -> { - String fname = call.argument("filename"); - if (fname == null) { - result.error("util.file.executable", "no filename", null); - return; - } - fileExecutablize(fname); - result.success(true); - } - case "util.arch" -> { - result.success(External.getArch()); - } - case "util.workspace" -> { - result.success(workspaceBaseDir()); - } - } - } - }); - - new EventChannel( - flutterEngine.getDartExecutor().getBinaryMessenger(), - "net.seven.nodebase/event" - ).setStreamHandler(NodeAppService.getEventHandler()); - } - - public ChannelResult startNodeApp(String name, ArrayList cmd, HashMap env) { - Logger.i( - "NodeBase", - "startNodeApp", - String.format("start node app (%s) -> %s", name, cmd)); - Intent it = new Intent(getContext(), ForegroundNodeService.class); - ContextCompat.startForegroundService(getContext(), it); - String[] cmd_ = new String[cmd.size()]; - cmd.toArray(cmd_); - NodeAppService.startNodeApp(name, cmd_, env); - return ChannelResult.OK; - } - - public ChannelResult stopNodeApp(String name) { - Logger.i( - "NodeBase", - "stopNodeApp", - String.format("stop node app (%s)", name)); - Intent it = new Intent(getContext(), ForegroundNodeService.class); - if (NodeAppService.getRunningNodeAppCount() <= 1) { - stopService(it); - } else { - NodeAppService.stopNodeApp(name); - } - return ChannelResult.OK; - } - - public HashMap getNodeAppStatus(String name) { - // TODO get NodeMonitor and assemble data as json - NodeAppMonitor app = NodeAppService.getNodeApp(name); - HashMap json = new HashMap<>(); - String state = "none"; - if (app != null) { - if (app.nodebaseIsReady()) state = "new"; - else if (app.nodebaseIsRunning()) state = "running"; - else if (app.nodebaseIsDead()) state = "dead"; - json.put("state", state); - } - return json; - } - - public HashMap> getIPs() { - var json = Network.getIPs(); - return json; - } - - public boolean fileExecutablize(String fname) { - File f = new File(fname); - return f.setExecutable(true, true); - } - - public String workspaceBaseDir() { - return getContext().getApplicationInfo().dataDir; - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/Network.java b/android/app/src/main/java/net/seven/nodebase/nodebase/Network.java deleted file mode 100755 index 0f9b361..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/Network.java +++ /dev/null @@ -1,46 +0,0 @@ -package net.seven.nodebase.nodebase; - -import java.net.InterfaceAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -public class Network { - public static HashMap> getIPs() { - return getIPsFromAndroidApi(); - } - - public static HashMap> getIPsFromAndroidApi() { - HashMap> r = new HashMap<>(); - try { - for (NetworkInterface nic : Collections.list(NetworkInterface.getNetworkInterfaces())) { - String nic_name = nic.getName(); - List nic_addr = nic.getInterfaceAddresses(); - ArrayList ips = new ArrayList<>(); - for (InterfaceAddress ia : nic_addr) { - String addr = ia.getAddress().getHostAddress(); - // skip the address % - if (addr == null || addr.indexOf('%') >= 0) continue; - ips.add(addr); - } - if (ips.size() > 0) r.put(nic_name, ips); - } - Logger.d( - "NodeBase", - "getIPsFromAndroidApi", - r.toString() - ); - } catch (SocketException e) { - Logger.e( - "NodeBase", - "getIPsFromAndroidApi", - e.toString() - ); - } - return r; - } - -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java deleted file mode 100755 index 52c9b22..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppMonitor.java +++ /dev/null @@ -1,234 +0,0 @@ -package net.seven.nodebase.nodebase; - -import android.os.Build; -import android.os.Handler; -import android.os.Looper; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Locale; - -public class NodeAppMonitor extends Thread { - private enum STAT { - UNKNOWN, - BORN, - READY, - RUNNING, - DEAD - } - - private STAT nodebaseStat; - private Process nodebaseProcess; - private final String nodebaseName; - private final String[] nodebaseCmd; - private final HashMap nodebaseEnv; - - public NodeAppMonitor(String name, String[] cmd, HashMap env) { - super(); - this.nodebaseName = name; - this.nodebaseCmd = cmd; - this.nodebaseEnv = new HashMap<>(); - if (env != null) this.nodebaseEnv.putAll(env); - this.nodebaseStat = STAT.BORN; - this.nodebaseProcess = null; - } - - public boolean nodebaseIsRunning() { return STAT.RUNNING == this.nodebaseStat; } - public boolean nodebaseIsReady() { return STAT.READY == this.nodebaseStat; } - public boolean nodebaseIsDead() { return STAT.DEAD == this.nodebaseStat; } - - private int nodebasePid() { - Process p = this.nodebaseProcess; - if (p == null) return -1; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - if (!p.isAlive()) return -1; - } - Class k = p.getClass(); - if ("java.lang.UNIXProcess".equals(k.getName())) { - try { - int pid = -1; - Field f = k.getDeclaredField("pid"); - f.setAccessible(true); - // this try to make sure if getInt throw an error, - // `setAccessible(false)` can be executed - // so that `pid` is protected after this access - try { pid = f.getInt(p); } catch (IllegalAccessException e) { } - f.setAccessible(false); - return pid; - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - return -1; - } - - private ArrayList nodebaseChildrenPids(int pid) { - // XXX maybe we can get sub processes pids from a stable way like /proc - // for a workaround, currently we just use `ps` - ArrayList children = new ArrayList<>(); - String output = Command.checkOutput(new String[] { - "/system/bin/ps", - "-o", "pid=", "--ppid", String.valueOf(pid) - }); - if (output == null || output.length() == 0) return children; - String[] lines = output.trim().split("\n"); - for(String line : lines) { - line = line.trim(); - if (line.length() == 0) continue; - // TODO: try...catch... - int cpid = Integer.parseInt(line); - if (pid != cpid) children.add(cpid); - } - return children; - } - - private int[] nodebaseCollectPidsForKilling(ArrayList collected, int pid, boolean nested) { - if (pid < 0) return new int[0]; - if (collected == null) collected = new ArrayList<>(); - ArrayList pids = nodebaseChildrenPids(pid); - for (int childPid : pids) { - if (childPid < 0) continue; - collected.add(childPid); - Logger.i( - "NodeBase", - "monitor", - String.format( - Locale.getDefault(), - "killing (%d / %s) -> %d | parent=%d", - getId(), this.nodebaseName, - childPid, pid) - ); - if (nested) nodebaseCollectPidsForKilling(collected, childPid, true); - } - int n = collected.size(); - int[] r = new int[n]; - for (int i = 0; i < n; i++) { - r[i] = collected.get(i); - } - return r; - } - - public void nodebaseStart() { - this.start(); - } - - public boolean nodebaseStop() { - // XXX only RUNNING app can be stopped to avoid race condition - // stop non-RUNNING app will return false - if (this.nodebaseProcess == null) return false; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - if (!this.nodebaseProcess.isAlive()) return false; - } - int[] pids = this.nodebaseCollectPidsForKilling(null, this.nodebasePid(), true); - for (int pid : pids) { - android.os.Process.killProcess(pid); - } - this.nodebaseProcess.destroy(); - return true; - } - - public NodeAppMonitor nodebaseRestart() { - this.nodebaseStop(); - NodeAppMonitor m = new NodeAppMonitor(this.nodebaseName, this.nodebaseCmd, this.nodebaseEnv); - m.start(); - return m; - } - - @Override - public void run() { - Handler uiRunner; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - uiRunner = Handler.createAsync(Looper.getMainLooper()); - } else { - uiRunner = new Handler(Looper.getMainLooper()); - } - try { - this.nodebaseStat = STAT.READY; - // TODO event/onReady - Logger.i( - "NodeBase", - "monitor", - String.format( - Locale.getDefault(), - "starting (%d / %s) - %s", - getId(), this.nodebaseName, - String.join(" ", this.nodebaseCmd)) - ); - - // set RUNNING before set up the process - // when stop the service, it guarantees that no race condition for - // setting nodebaseStat - this.nodebaseStat = STAT.RUNNING; - ProcessBuilder build = new ProcessBuilder(this.nodebaseCmd); - // XXX: do we need to check some important variable should not be changed - // e.g. HOME, USER, PWD, ... - build.environment().putAll(this.nodebaseEnv); - this.nodebaseProcess = build.start(); - // TODO event/onStart - Logger.i( - "NodeBase", - "monitor", - String.format( - Locale.getDefault(), - "started (%d / %s)", - getId(), this.nodebaseName) - ); - - uiRunner.post(new Runnable() { - @Override - public void run() { - ArrayList r = new ArrayList<>(); - r.add("start"); - r.add(nodebaseName); - NodeAppService.getEventHandler().postMessage("app", r); - } - }); - - this.nodebaseProcess.waitFor(); - } catch (IOException e) { - Logger.e( - "NodeService", - "monitor", - String.format( - Locale.getDefault(), - "io error (%d / %s) - %s", - getId(), this.nodebaseName, e) - ); - this.nodebaseProcess = null; - // TODO event/onError - } catch (InterruptedException e) { - Logger.e( - "NodeService", - "monitor", - String.format( - Locale.getDefault(), - "interrupted error (%d / %s) - %s", - getId(), this.nodebaseName, e) - ); - // TODO event/onError - } - - this.nodebaseStat = STAT.DEAD; - // TODO: event/onPost - Logger.e( - "NodeService", - "monitor", - String.format( - Locale.getDefault(), - "stopped (%d / %s)", - getId(), this.nodebaseName) - ); - - uiRunner.post(new Runnable() { - @Override - public void run() { - ArrayList r = new ArrayList<>(); - r.add("stop"); - r.add(nodebaseName); - NodeAppService.getEventHandler().postMessage("app", r); - } - }); - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java deleted file mode 100755 index 0deffca..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeAppService.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.seven.nodebase.nodebase; - -import java.util.HashMap; - -public class NodeAppService { - private static final NodeBaseEventHandler eventHandler = new NodeBaseEventHandler(); - private static final HashMap services = new HashMap<>(); - - public static NodeBaseEventHandler getEventHandler() { - return eventHandler; - } - - public static int getRunningNodeAppCount() { - int count = 0; - for (NodeAppMonitor app : services.values()) { - if (app != null && !app.nodebaseIsDead()) count ++; - } - return count; - } - - public static void startNodeApp(String name, String[] cmd, HashMap env) { - synchronized (services) { - NodeAppMonitor app; - if (services.containsKey(name)) { - app = services.get(name); - if (app != null && !app.nodebaseIsDead()) return; - // only process if the service is null/dead - } - app = new NodeAppMonitor(name, cmd, env); - app.nodebaseStart(); - services.put(name, app); - } - } - - public static void restartNodeApp(String name) { - synchronized (services) { - if (!services.containsKey(name)) return; - NodeAppMonitor app = services.get(name); - if (app == null) { - services.remove(name); - return; - } - services.put(name, app.nodebaseRestart()); - } - } - - public static void stopNodeApp(String name) { - synchronized (services) { - if (!services.containsKey(name)) return; - NodeAppMonitor app = services.get(name); - if (app == null) return; - if (app.nodebaseIsDead()) return; - app.nodebaseStop(); - } - } - - public static void stopNodeApps() { - for (String name : services.keySet()) { - stopNodeApp(name); - } - } - - public static NodeAppMonitor getNodeApp(String name) { - if (!services.containsKey(name)) return null; - return services.get(name); - } -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBase.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBase.java deleted file mode 100755 index 86f311d..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBase.java +++ /dev/null @@ -1,4 +0,0 @@ -package net.seven.nodebase.nodebase; - -public class NodeBase { -} diff --git a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java b/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java deleted file mode 100755 index be91ae4..0000000 --- a/android/app/src/main/java/net/seven/nodebase/nodebase/NodeBaseEventHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.seven.nodebase.nodebase; - -import java.util.ArrayList; -import java.util.HashMap; - -import io.flutter.plugin.common.EventChannel; - -public class NodeBaseEventHandler implements EventChannel.StreamHandler { - private HashMap sink = new HashMap<>(); - - @Override - public synchronized void onListen(Object name, EventChannel.EventSink events) { - if (name instanceof String) { - sink.put((String) name, events); - } - } - - @Override - public synchronized void onCancel(Object name) { - if (name instanceof String) { - sink.remove((String) name); - } - } - - public synchronized void postMessage(String name, Object message) { - EventChannel.EventSink ch = sink.get(name); - if (ch == null) return; - ch.success(message); - } -} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100755 index 1cb7aa2..0000000 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml deleted file mode 100755 index 8403758..0000000 --- a/android/app/src/main/res/drawable/launch_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100755 index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml deleted file mode 100755 index 360a160..0000000 --- a/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml deleted file mode 100755 index 5fac679..0000000 --- a/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml deleted file mode 100755 index 8ffe024..0000000 --- a/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100755 index 7ff1933..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -buildscript { - ext.kotlin_version = '1.7.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100755 index 599d206..0000000 --- a/android/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -org.gradle.jvmargs=-Xmx4G -android.useAndroidX=true -android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false -android.nonFinalResIds=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100755 index 81fb745..0000000 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100755 index ee56b97..0000000 --- a/android/settings.gradle +++ /dev/null @@ -1,29 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() - - includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } - - plugins { - id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.2.1' apply false -} - -include ":app" diff --git a/asset/image/logo.png b/asset/image/logo.png deleted file mode 100644 index 3a6aa2abfa7356272e613da56ff82696e9043f0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3173 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 - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 12.0 - - diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig deleted file mode 100755 index 0b2d479..0000000 --- a/ios/Flutter/Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig deleted file mode 100755 index 0b2d479..0000000 --- a/ios/Flutter/Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj deleted file mode 100755 index b63de6e..0000000 --- a/ios/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,609 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 331C80F4294D02FB00263BE5 /* RunnerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 331C80F3294D02FB00263BE5 /* RunnerTests.m */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C80F5294D02FB00263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97C146E61CF9000F007C117D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 97C146ED1CF9000F007C117D; - remoteInfo = Runner; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 331C80F1294D02FB00263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 331C80F3294D02FB00263BE5 /* RunnerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RunnerTests.m; sourceTree = ""; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; - 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 331C80EE294D02FB00263BE5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C80F2294D02FB00263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C80F3294D02FB00263BE5 /* RunnerTests.m */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 331C80F2294D02FB00263BE5 /* RunnerTests */, - 97C146EF1CF9000F007C117D /* Products */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - 331C80F1294D02FB00263BE5 /* RunnerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - ); - path = Runner; - sourceTree = ""; - }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C80F0294D02FB00263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C80F7294D02FB00263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C80ED294D02FB00263BE5 /* Sources */, - 331C80EE294D02FB00263BE5 /* Frameworks */, - 331C80EF294D02FB00263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C80F6294D02FB00263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C80F1294D02FB00263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1430; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 331C80F0294D02FB00263BE5 = { - CreatedOnToolsVersion = 14.0; - TestTargetID = 97C146ED1CF9000F007C117D; - }; - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - 331C80F0294D02FB00263BE5 /* RunnerTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 331C80EF294D02FB00263BE5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C80ED294D02FB00263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C80F4294D02FB00263BE5 /* RunnerTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C80F6294D02FB00263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 97C146ED1CF9000F007C117D /* Runner */; - targetProxy = 331C80F5294D02FB00263BE5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase; - PRODUCT_NAME = "$(TARGET_NAME)"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 331C80F8294D02FB00263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Debug; - }; - 331C80F9294D02FB00263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Release; - }; - 331C80FA294D02FB00263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase; - PRODUCT_NAME = "$(TARGET_NAME)"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase; - PRODUCT_NAME = "$(TARGET_NAME)"; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 331C80F7294D02FB00263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 331C80F8294D02FB00263BE5 /* Debug */, - 331C80F9294D02FB00263BE5 /* Release */, - 331C80FA294D02FB00263BE5 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100755 index c4b79bd..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100755 index fc6bf80..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100755 index af0309c..0000000 --- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100755 index 2de4fc5..0000000 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100755 index 59c6d39..0000000 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100755 index fc6bf80..0000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100755 index af0309c..0000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/ios/Runner/AppDelegate.h b/ios/Runner/AppDelegate.h deleted file mode 100755 index a7bb489..0000000 --- a/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m deleted file mode 100755 index 569c492..0000000 --- a/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,13 +0,0 @@ -#import "AppDelegate.h" -#import "GeneratedPluginRegistrant.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GeneratedPluginRegistrant registerWithRegistry:self]; - // Override point for customization after application launch. - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100755 index 1950fd8..0000000 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100755 index dc9ada4725e9b0ddb1deab583e5b5102493aa332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100755 index 797d452e458972bab9d994556c8305db4c827017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100755 index 6ed2d933e1120817fe9182483a228007b18ab6ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100755 index 4cd7b0099ca80c806f8fe495613e8d6c69460d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100755 index fe730945a01f64a61e2235dbe3f45b08f7729182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100755 index 502f463a9bc882b461c96aadf492d1729e49e725..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100755 index 0ec303439225b78712f49115768196d8d76f6790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100755 index e9f5fea27c705180eb716271f41b582e76dcbd90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 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 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100755 index 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json deleted file mode 100755 index d08a4de..0000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchImage.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png deleted file mode 100755 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png deleted file mode 100755 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png deleted file mode 100755 index 9da19eacad3b03bb08bbddbbf4ac48dd78b3d838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md deleted file mode 100755 index 65a94b5..0000000 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - -You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard deleted file mode 100755 index 497371e..0000000 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard deleted file mode 100755 index bbb83ca..0000000 --- a/ios/Runner/Base.lproj/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist deleted file mode 100755 index 92b36e2..0000000 --- a/ios/Runner/Info.plist +++ /dev/null @@ -1,49 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Nodebase - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - nodebase - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CADisableMinimumFrameDurationOnPhone - - UIApplicationSupportsIndirectInputEvents - - - diff --git a/ios/Runner/main.m b/ios/Runner/main.m deleted file mode 100755 index 4618607..0000000 --- a/ios/Runner/main.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/ios/RunnerTests/RunnerTests.m b/ios/RunnerTests/RunnerTests.m deleted file mode 100755 index 478eaec..0000000 --- a/ios/RunnerTests/RunnerTests.m +++ /dev/null @@ -1,16 +0,0 @@ -#import -#import -#import - -@interface RunnerTests : XCTestCase - -@end - -@implementation RunnerTests - -- (void)testExample { - // If you add code to the Runner application, consider adding tests here. - // See https://developer.apple.com/documentation/xctest for more information about using XCTest. -} - -@end diff --git a/lib/comp/app_runtime_tile.dart b/lib/comp/app_runtime_tile.dart deleted file mode 100755 index 92da317..0000000 --- a/lib/comp/app_runtime_tile.dart +++ /dev/null @@ -1,95 +0,0 @@ -import 'package:flutter/material.dart'; -import './util.dart'; -import '../ctrl/application_def.dart'; - -class AppRuntimeTile extends StatefulWidget { - const AppRuntimeTile({super.key, required this.process}); - - final IApplicationProcess process; - - @override - State createState() => _AppRuntimeTileState(); -} - -class _AppRuntimeTileState extends State { - - @override - void initState() { - super.initState(); - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return ListTile( - title: Text(widget.process.getName()), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("platform: ${widget.process.getPlatform()}"), - ], - ), - trailing: Wrap( - spacing: 2, - children: [ - IconButton(onPressed: () { - showInfo(context); - }, icon: const Icon(Icons.info_outline)), - IconButton(onPressed: () { - showConfirmDialog( - context, - "Stop Application", - "Do you confirm to stop the application \"${widget.process.getName()}\"?" - ).then((confirmed) { - if (!confirmed) return; - widget.process.stop().then((_) { - generateSnackBar( - context, - "Stopped application \"${widget.process.getName()}\"" - ); - }); - }); - }, icon: const Icon(Icons.stop)), - ], - ), - tileColor: const Color.fromARGB(255, 230, 255, 230), - ); - } - - void showInfo(BuildContext context) { - final cmd = widget.process.getCmd(); - final cmdMain = cmd[0]; - final cmdEntry = cmd.length > 1 ? "\n${cmd[1]}" : ""; - showDialog(context: context, builder: (_) => AlertDialog( - title: const Text("Application Info"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const Text("-- CMD -- "), - SelectableText("$cmdMain$cmdEntry"), - const Divider(), - const Text("-- ENV --"), - SelectableText(widget.process.getEnv().entries.map( - (kv) => "${kv.key} =\n${kv.value}" - ).toList().join("\n\n")), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("OK")), - ], - )); - } -} \ No newline at end of file diff --git a/lib/comp/app_tile.dart b/lib/comp/app_tile.dart deleted file mode 100755 index 77177c0..0000000 --- a/lib/comp/app_tile.dart +++ /dev/null @@ -1,212 +0,0 @@ -import 'dart:developer'; - -import 'package:flutter/material.dart'; -import './run_app_steps.dart'; -import './util.dart'; -import '../ctrl/nodebase.dart' as nodebase; - -class AppTile extends StatefulWidget { - const AppTile({ - super.key, - required this.name, - required this.version, - required this.platform, - this.defaultInstalled = false, - this.defaultRunning = false, - this.userDefined = false, - }); - - final String name; - final String version; - final String platform; - final bool defaultInstalled; - final bool defaultRunning; - final bool userDefined; - - @override - State createState() => _AppTileState(); -} - -class _AppTileState extends State { - AppTile? detect; - bool isInstalled = false; - - bool isDownloading = false; - bool isRunning = false; - bool isRemoving = false; - - void setInstall(bool installed) { - setState(() { - isInstalled = installed; - }); - } - - @override - void initState() { - super.initState(); - isInstalled = widget.defaultInstalled; - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final List actions = []; - if (detect != widget) { - isInstalled = widget.defaultInstalled; - isRunning = widget.defaultRunning; - detect = widget; - } - if (isInstalled) { - actions.add(IconButton(onPressed: isRemoving ? null : () { - showInfo(context); - }, icon: const Icon(Icons.info_outline))); - actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { - // TODO: if platform is not installed, pop up a dialog for installation - // list all available name - {versions} - // TODO: pop up a dialog for exec, env set up - // read exec, env from last run or default value - Map config = { - "name": widget.name, - "version": widget.version, - "platform": widget.platform, - }; - runAppInit(context, config).then((ok0) { - if (!ok0) return; - runAppStepCheckPlatform(context, config).then((ok1) { - if (!ok1) return; - runAppStepArgAndEnv(context, config).then((ok2) { - if (!ok2) return; - runAppStepReview(context, config).then((app) { - if (app == null) return; - saveAppConfig(config); - }); - }); - }); - }); - }, icon: const Icon(Icons.play_arrow))); - actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { - // TODO: check if running, no remove - // TODO: try ... catch ... - showConfirmDialog( - context, - "Remove Application", - "Do you confirm to remove the application \"${widget.name}-${widget.version}\"?" - ).then((confirmed) { - if (!confirmed) return; - isRemoving = true; - (() async { - try { - await nodebase.instance.platform.removeApplicationBinary( - widget.name, widget.version, widget.platform); - return true; - } catch (e) { - log("NodeBase [E] AppTile ... remove application \"${widget.name}-${widget.version}\" $e"); - return false; - } - })().then((ok) { - isRemoving = false; - if (!ok) return; - setInstall(false); - generateSnackBar(context, "Removed application: \"${widget.name}-${widget.version}\""); - }); - }); - }, icon: const Icon(Icons.delete_forever))); - } else { - actions.add(IconButton(onPressed: isDownloading ? null : () { - (() async { - final name = widget.name; - final version = widget.version; - final confirmed = await showConfirmDialog( - context, - "Install Application", - "Do you confirm to install the application \"$name-$version\"?" - ); - if (!confirmed) return "cancel"; - isDownloading = true; - final platform = nodebase.instance.platform; - try { - await platform.downloadApplicationMetaJson(name, version); - final json = await platform.readApplicationMetaJson(name, version); - final url = json["source"]; - await platform.downloadApplicationBinary(name, version, widget.platform, url); - return "ok"; - } catch (e) { - log("NodeBase [E] AppTile:install ${widget.name}-${widget.version} ... $e"); - return e.toString(); - } - })().then((r) { - isDownloading = false; - if (r == "cancel") return; - if (r == "ok") { - setInstall(true); - generateSnackBar(context, "Installed application: \"${widget.name}-${widget.version}\""); - } else { - generateSnackBar(context, "Failed to install application: \"${widget.name}-${widget.version}\""); - } - }); - }, icon: const Icon(Icons.download))); - } - return ListTile( - title: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Row( - children: [ - ...(widget.userDefined ? [ - const Tooltip( - message: "Not in marketplace", - child: Icon(Icons.person_pin_circle_rounded, size: 12), - ), - ]: []), - Expanded(child: Text( - "${widget.name}-${widget.version}", - overflow: TextOverflow.ellipsis, - )), - ], - ), - ], - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("platform: ${widget.platform}") - ], - ), - trailing: Wrap( - spacing: 2, - children: actions, - ), - ); - } - - void showInfo(BuildContext context) { - final name = widget.name; - final version = widget.version; - showDialog(context: context, builder: (_) => AlertDialog( - title: const Text("Application Info"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const Text("-- Basic -- "), - SelectableText("$name-$version\n(${widget.platform})"), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("OK")), - ], - )); - } -} \ No newline at end of file diff --git a/lib/comp/download_tile.dart b/lib/comp/download_tile.dart deleted file mode 100755 index 619c1f0..0000000 --- a/lib/comp/download_tile.dart +++ /dev/null @@ -1,137 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import './util.dart'; -import '../util/event.dart' as event; -import '../ctrl/nodebase.dart' as nodebase; - -class DownloadTile extends StatefulWidget { - const DownloadTile({ - super.key, - required this.name, - required this.type, - required this.url, - required this.filename, - }); - - final String name; - final String type; - final String url; - final String filename; - - @override - State createState() => _DownloadTileState(); -} - -class _DownloadTileState extends State with TickerProviderStateMixin { - late AnimationController controller; - bool isDeterminate = false; - double progressValue = 0.0; - bool isCanceling = false; - - late StreamSubscription progress; - - void modeDeterminate(double value) => setState(() { - isDeterminate = true; - controller.stop(); - controller.value = value; - }); - void modeNonDeterminate() => setState(() { - isDeterminate = false; - controller - ..forward(from: 0) - ..repeat(); - }); - - @override - void initState() { - super.initState(); - controller = AnimationController( - vsync: this, - duration: const Duration(seconds: 1), - )..addListener(() { - setState(() {}); - }); - controller.repeat(); - - progress = event.platformToken.stream.listen((msg) { - final T = msg[0]; - if (T != "download") return; - final F = msg[3]; - if (F != widget.filename) return; - final V = msg[4]; - if (V == -99) { - modeNonDeterminate(); - } else if (V == -1) { - setState(() { - isCanceling = true; - }); - } else { - modeDeterminate(V + 0.0); - } - }); - } - - @override - void dispose() { - progress.cancel(); - controller.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - return ListTile( - title: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const Text("download"), - Text( - "${widget.type} - ${widget.name}", - overflow: TextOverflow.ellipsis, - ), - ], - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SelectableText( - widget.url, - maxLines: 1, - ), - LinearProgressIndicator( - value: controller.value, - semanticsLabel: 'Linear progress indicator', - ), - ], - ), - trailing: Wrap( - spacing: 2, - children: [ - IconButton(onPressed: isCanceling ? null :() { - (() async { - final confirmed = await showConfirmDialog( - context, - "Cancel Downloading", - "Do you confirm to cancel downloading for \"${widget.type} - ${widget.name}\"?" - ); - if (!confirmed) return false; - isCanceling = true; - await nodebase.instance.platform.downloadCancel(widget.filename); - // TODO: deal with if no network downloading - // event.platformToken.add(["download", widget.name, widget.url, widget.filename, -1]); - return true; - })().then((ok) { - isCanceling = false; - if (!ok) return; - generateSnackBar( - context, - "Canceled downloading for \"${widget.type} - ${widget.name}\"" - ); - }); - }, icon: const Icon(Icons.file_download_off)), - ], - ), - ); - } -} \ No newline at end of file diff --git a/lib/comp/platform_tile.dart b/lib/comp/platform_tile.dart deleted file mode 100755 index e9ad422..0000000 --- a/lib/comp/platform_tile.dart +++ /dev/null @@ -1,183 +0,0 @@ -import 'dart:developer'; - -import 'package:flutter/material.dart'; -import './util.dart'; -import '../ctrl/nodebase.dart' as nodebase; - -class PlatformTile extends StatefulWidget { - const PlatformTile({ - super.key, - required this.name, - required this.version, - this.defaultInstalled = false, - this.defaultRunning = false, - this.userDefined = false, - }); - - final String name; - final String version; - final bool defaultInstalled; - final bool defaultRunning; - final bool userDefined; - - @override - State createState() => _AppTileState(); -} - -class _AppTileState extends State { - PlatformTile? detect; - bool isInstalled = false; - - bool isDownloading = false; - bool isRunning = false; - bool isRemoving = false; - - void setInstall(bool installed) { - setState(() { - isInstalled = installed; - }); - } - - @override - void initState() { - super.initState(); - } - - @override - void dispose() { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final List actions = []; - if (detect != widget) { - isInstalled = widget.defaultInstalled; - isRunning = widget.defaultRunning; - detect = widget; - } - if (isInstalled) { - actions.add(IconButton(onPressed: isRemoving ? null : () { - showInfo(context); - }, icon: const Icon(Icons.info_outline))); - actions.add(IconButton(onPressed: isRemoving || isRunning ? null : () { - // TODO: check if running, no remove - // TODO: try ... catch ... - showConfirmDialog( - context, - "Remove Platform", - "Do you confirm to remove the platform \"${widget.name}-${widget.version}\"?" - ).then((confirmed) { - if (!confirmed) return; - isRemoving = true; - (() async { - try { - await nodebase.instance.platform.removePlatformBinary(widget.name, widget.version); - return true; - } catch(e) { - log("NodeBase [E] PlatformTile ... remove platform \"${widget.name}-${widget.version}\" $e"); - return false; - } - })().then((ok) { - isRemoving = false; - if (!ok) return; - setInstall(false); - generateSnackBar(context, "Removed platform: \"${widget.name}-${widget.version}\""); - }); - }); - }, icon: const Icon(Icons.delete_forever))); - } else { - actions.add(IconButton(onPressed: isDownloading ? null : () { - (() async { - final name = widget.name; - final version = widget.version; - final confirmed = await showConfirmDialog( - context, - "Install Platform", - "Do you confirm to install the platform \"$name-$version\"?" - ); - if (!confirmed) return "cancel"; - isDownloading = true; - final platform = nodebase.instance.platform; - try { - await platform.downloadPlatformMetaJson(name, version); - final json = await platform.readPlatformMetaJson(name, version); - final url = json["source"]; - await platform.downloadPlatformBinary(name, version, url); - return "ok"; - } catch (e) { - log("NodeBase [E] PlatformTile:install ${widget.name}-${widget.version} ... $e"); - return e.toString(); - } - })().then((r) { - isDownloading = false; - if (r == "cancel") return; - if (r == "ok") { - setInstall(true); - generateSnackBar(context, "Installed platform: \"${widget.name}-${widget.version}\""); - } else { - generateSnackBar(context, "Failed to install platform: \"${widget.name}-${widget.version}\""); - } - }); - }, icon: const Icon(Icons.download))); - } - return ListTile( - title: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Row( - children: [ - ...(widget.userDefined ? [ - const Tooltip( - message: "Not in marketplace", - child: Icon(Icons.person_pin_circle_rounded, size: 12), - ), - ]: []), - Expanded(child: Text( - "${widget.name}-${widget.version}", - overflow: TextOverflow.ellipsis, - )), - ], - ) - ], - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("(${nodebase.instance.platform.getName()})") - ], - ), - trailing: Wrap( - spacing: 2, - children: actions, - ), - ); - } - - void showInfo(BuildContext context) { - final name = widget.name; - final version = widget.version; - showDialog(context: context, builder: (_) => AlertDialog( - title: const Text("Platform Info"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const Text("-- Basic -- "), - SelectableText("$name-$version\n(${nodebase.instance.platform.getName()})"), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("OK")), - ], - )); - } -} \ No newline at end of file diff --git a/lib/comp/run_app_steps.dart b/lib/comp/run_app_steps.dart deleted file mode 100755 index 7f987d1..0000000 --- a/lib/comp/run_app_steps.dart +++ /dev/null @@ -1,527 +0,0 @@ -import 'dart:async'; -import 'package:flutter/material.dart'; -import 'package:path/path.dart' as path; - -import '../ctrl/application_def.dart'; -import '../ctrl/nodebase.dart' as nodebase; -import './util.dart'; - -const defaultHintStyle = TextStyle(color: Color.fromARGB(128, 0, 0, 0)); - -class ArgInput extends StatelessWidget { - const ArgInput({ - super.key, - required this.onDelete, - required this.onChanged, - this.required = false, - this.placeholder = "", - this.initialValue = "", - }); - - final bool required; - final String placeholder; - final String initialValue; - final void Function(ArgInput)? onDelete; - final void Function(ArgInput, String)? onChanged; - - @override - Widget build(BuildContext context) { - return Row( - textDirection: TextDirection.rtl, - children: [ - ...(required ? [] : [IconButton( - onPressed: onDelete == null ? null : () => onDelete!(this), - icon: const Icon(Icons.close) - )]), - Expanded(child: TextFormField( - initialValue: initialValue, - onChanged: onChanged == null ? null : (val) => onChanged!(this, val), - decoration: InputDecoration( - hintText: placeholder, - hintStyle: defaultHintStyle - ), - )), - ], - ); - } - -} - -class EnvInput extends StatelessWidget { - const EnvInput({ - super.key, - required this.onDelete, - required this.onKeyChanged, - required this.onValChanged, - this.required = false, - this.placeholder = "", - this.initialKeyValue = "", - this.initialValValue = "", - }); - - final bool required; - final String placeholder; - final String initialKeyValue; - final String initialValValue; - final void Function(EnvInput)? onDelete; - final void Function(EnvInput, String)? onKeyChanged; - final void Function(EnvInput, String)? onValChanged; - - @override - Widget build(BuildContext context) { - return Row( - textDirection: TextDirection.rtl, - children: [ - ...(required ? [] : [IconButton( - onPressed: onDelete == null ? null : () => onDelete!(this), - icon: const Icon(Icons.close) - )]), - Expanded(child: TextFormField( - initialValue: initialValValue, - onChanged: onValChanged == null ? null : (val) => onValChanged!(this, val), - decoration: InputDecoration( - hintText: placeholder, - hintStyle: defaultHintStyle - ), - )), - Expanded(child: TextFormField( - initialValue: initialKeyValue, - onChanged: onKeyChanged == null ? null : (val) => onKeyChanged!(this, val), - )), - ], - ); - } - -} - -Future runAppInit(BuildContext context, Map config) async { - final name = config["name"] ?? ""; - final version = config["version"] ?? ""; - final platform = config["platform"] ?? ""; - if (name == "" || version == "" || platform == "") return false; - config["base"] = await nodebase.instance.platform.getApplicationBaseDir(name, version); - // meta.entryPoint[0] - final meta = await nodebase.instance.platform.readApplicationMetaJson(name, version); - config["availableEntryPoint"] = meta["entryPoint"] ?? []; - config["argRequire"] = meta["argRequire"] ?? []; - config["envRequire"] = meta["envRequire"] ?? []; - // savedConfig.arg, savedConfig.env - final savedConfig = await nodebase.instance.platform.readApplicationConfig(name, version); - - final lastArg = savedConfig["arg"] ?? []; - config["lastArg"] = []; - for(int i = 0, n = lastArg.length, m = config["argRequire"].length; i < n || i < m; i++) { - if (i < m && i < n) { - final one = config["argRequire"][i]; - config["lastArg"].add({ - "help": one["help"] ?? "", - "default": one["default"] ?? "", - "last": lastArg[i], - "required": one["required"] ?? true, - }); - } else if (i < m && i >= n) { - final one = config["argRequire"][i]; - config["lastArg"].add({ - "help": one["help"] ?? "", - "default": one["default"] ?? "", - "last": null, - "required": one["required"] ?? true, - }); - } else { - config["lastArg"].add({ - "help": "", - "default": "", - "last": lastArg[i], - "required": false, - }); - } - } - - final lastEnv = savedConfig["env"] ?? {}; - config["lastEnv"] = {}; - for(int i = 0, n = config["envRequire"].length; i < n; i++) { - final one = config["envRequire"][i]; - final name = one["name"]; - config["lastEnv"][name] = { - "name": name, - "help": one["help"] ?? "", - "default": one["default"], - "last": lastEnv[name] ?? "", - "required": one["required"] ?? false, - }; - } - for(final k in lastEnv.keys) { - final one = config["lastEnv"][k]; - if (one == null) { - config["lastEnv"][k] = { - "name": k, - "help": "", - "default": "", - "last": lastEnv[k], - "required": false, - }; - } - } - - config["lastEntryPoint"] = savedConfig["entryPoint"]; - config["lastExec"] = savedConfig["exec"]; - config["lastPlatformVersion"] = savedConfig["platformVersion"]; - // installed: {name: [version,...]} - final installed = await nodebase.instance.platform.listInstalledPlatformList(); - config["platformList"] = {}; - config["platformList"][platform] = installed[platform]; - return true; -} - -Future runAppStepCheckPlatform(BuildContext context, Map config) async { - final platform = config["platform"]; - if (config["platformList"][platform] == null) { - // no install, check available and guide to download - await downloadPlatform(context, config); - } else { - // by default select last one, guide user to select platform version - return await selectPlatform(context, config); - } - return false; -} -Future downloadPlatform(BuildContext context, Map config) async { - // TODO: show all; click one download and stop app running - final platform = config["platform"]; - generateSnackBar(context, "Dependency missing.\nNo available versions for \"$platform\"."); -} -Future> getPlatformExec(String name, String version) async { - Map meta = await nodebase.instance.platform.readPlatformMetaJson(name, version); - List r = []; - for (final one in meta["executable"]) { - r.add(one); - } - return r; -} -Future selectPlatform(BuildContext context, Map config) async { - final platform = config["platform"]; - final platformList = config["platformList"][platform]; - final List> dropdownItems = [ - const DropdownMenuItem(value: "-", child: Text("(not selected)")), - ]; - for (final value in platformList) { - dropdownItems.add(DropdownMenuItem(value: value, child: Text(value))); - } - String selected = "-"; - String selectedExec = "-"; - List execs = []; - bool firstTime = true; - bool ok = false; - await showDialog(context: context, builder: (context) { - return StatefulBuilder( - builder: (context, setState) { - if (firstTime && selected == "-" && config["lastPlatformVersion"] != null) { - firstTime = false; - final lastSelected = config["lastPlatformVersion"]; - final lastSelectedExec = config["lastExec"]; - if (config["platformList"][platform].contains(lastSelected)) { - getPlatformExec(platform, lastSelected).then((list) { - selected = lastSelected; - execs = list; - if (list.contains(lastSelectedExec)) { - selectedExec = lastSelectedExec; - } - setState(() {}); - }); - } - } - return AlertDialog( - title: const Text("Select Platform"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text("Platform: $platform"), - DropdownButton( - value: selected, - items: dropdownItems, - onChanged: (val) { - if (val == null) return; - selected = val; - if (val == "-") { - execs = []; - setState(() {}); - return; - } - getPlatformExec(platform, selected).then((list) { - execs = list; - setState(() {}); - }); - }, - ), - ...(selected == "-" ? [] : [ - const Text("Exec"), - DropdownButton(items: [ - const DropdownMenuItem(value: "-", child: Text("(not selected)")), - ...execs.map((name) => DropdownMenuItem( - value: name, - child: Text(path.basename(name), overflow: TextOverflow.ellipsis), - )) - ], onChanged: (val) { - if (val == null) return; - selectedExec = val; - setState(() {}); - }, value: selectedExec), - ]), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("Cancel")), - ElevatedButton( - onPressed: selected == "-" || selectedExec == "-" ? null : () { - Navigator.of(context).pop(); - ok = true; - }, - child: const Text("Next")), - ], - ); - } - ); - } - ); - if (!ok) return false; - config["platformVersion"] = selected; - config["selectedExec"] = selectedExec; - config["exec"] = path.join( - await nodebase.instance.platform.getPlatformBaseDir(platform, selected), - selectedExec - ); - return true; -} - -ArgInput generateArgInput(List argItems, List arg, dynamic one, Function setState) { - return ArgInput( - onDelete: (self) { - final i = argItems.indexOf(self); - argItems.removeAt(i); - arg.removeAt(i); - setState(() {}); - }, onChanged: (self, val) { - final i = argItems.indexOf(self); - arg[i] = val; - }, - required: one["required"] ?? false, - placeholder: one["help"] ?? "", - initialValue: one["last"] ?? one["default"] ?? "" - ); -} -EnvInput generateEnvInput(List envItems, List envk, List envv, dynamic one, Function setState) { - return EnvInput( - onDelete: (self) { - final i = envItems.indexOf(self); - envItems.removeAt(i); - envk.removeAt(i); - envv.removeAt(i); - setState(() {}); - }, onKeyChanged: (self, val) { - final i = envItems.indexOf(self); - envk[i] = val; - }, onValChanged: (self, val) { - final i = envItems.indexOf(self); - envv[i] = val; - }, - required: one["required"] ?? false, - placeholder: one["help"] ?? "", - initialKeyValue: one["name"] ?? "", - initialValValue: one["last"] ?? one["default"] ?? "", - ); -} - -Future runAppStepArgAndEnv(BuildContext context, Map config) async { - final name = config["name"]; - final version = config["version"]; - final availableEntryPoint = config["availableEntryPoint"]; - final List> dropdownItems = [ - const DropdownMenuItem(value: "-", child: Text("(not selected)")), - ]; - for (final value in availableEntryPoint) { - dropdownItems.add(DropdownMenuItem(value: value, child: Text(value))); - } - String selected = config["lastEntryPoint"] ?? "-"; - List arg = []; - List envk = []; - List envv = []; - bool ok = false; - final List argItems = []; - final List envItems = []; - for (final _ in config["lastArg"]) { - argItems.add(null); - arg.add(""); - } - for (final _ in config["lastEnv"].values) { - envItems.add(null); - } - - await showDialog(context: context, builder: (context) { - return StatefulBuilder( - builder: (context, setState) { - int i = 0; - for (final one in config["lastArg"]) { - if (i >= argItems.length) break; - argItems[i] = generateArgInput(argItems, arg, one, setState); - arg[i] = one["last"] ?? one["default"] ?? ""; - i ++; - } - i = 0; - for (final one in config["lastEnv"].values) { - if (i >= envItems.length) break; - envItems[i] = generateEnvInput(envItems, envk, envv, one, setState); - envv[i] = one["name"] ?? ""; - envk[i] = one["last"] ?? one["default"] ?? ""; - i ++; - } - return AlertDialog( - title: const Text("Config Application"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const Text("Entrypoint"), - DropdownButton( - value: selected, - items: dropdownItems, - onChanged: (val) { - if (val == null) return; - selected = val; - setState(() {}); - }, - ), - ...(selected == "-" ? []: [ - const Text("Arg"), - ...argItems, - TextButton(onPressed: () { - final newOne = generateArgInput(argItems, arg, {}, setState); - argItems.add(newOne); - arg.add(""); - setState(() {}); - }, child: const Text("+")), - const Text("Env"), - ...envItems, - TextButton(onPressed: () { - final newOne = generateEnvInput(envItems, envk, envv, {}, setState); - envItems.add(newOne); - envk.add(""); - envv.add(""); - setState(() {}); - }, child: const Text("+")), - ]), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("Cancel")), - ElevatedButton( - onPressed: selected == "-" ? null : () { - Navigator.of(context).pop(); - ok = true; - }, - child: const Text("Next")), - ], - ); - }); - }); - // TODO: check required arg, env - if (!ok) return false; - config["selectedEntryPoint"] = selected; - config["entryPoint"] = path.join( - await nodebase.instance.platform.getApplicationBaseDir(name, version), - selected - ); - - config["arg"] = arg; - - Map env = {}; - for (int i = 0, n = envk.length; i < n; i++) { - final k = envk[i]; - final v = envv[i]; - if (k == "" || v == "") continue; - env[k] = v; - } - config["env"] = env; - return true; -} - -Future runAppStepReview(BuildContext context, Map config) async { - final name = config["name"]; - final version = config["version"]; - final platform = config["platform"]; - final platformVersion = config["platformVersion"]; - final arg = config["arg"] ?? []; - final env = config["env"] ?? {}; - final entryPoint = config["entryPoint"]; // should not null - final exec = config["exec"]; // should not null - bool ok = false; - - await showDialog(context: context, builder: (_) => AlertDialog( - title: const Text("Application Info"), - shape: const BeveledRectangleBorder(), - content: SizedBox( - height: 200, - width: 300, - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - SelectableText("-- Application --\n" - "$name-$version\n\\-> ${path.basename(entryPoint)}\n\n" - "-- Platform --\n$platform-$platformVersion\n\\-> ${path.basename(exec)}\n\n" - "-- Config --\n" - "-> Arg\n${arg.isEmpty ? "(empty)" : arg.join("\n")}\n" - "-> Env\n${env.isEmpty ? "(empty)" : env.entries.map( - (item) => "${item.key} = ${item.value}").toList().join("\n")}" - ), - ], - ), - ), - ), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text("Cancel")), - ElevatedButton( - onPressed: () { - Navigator.of(context).pop(); - ok = true; - }, - child: const Text("Run")), - ], - )); - if (!ok) return null; - // TODO: mark platform is running - final app = nodebase.instance.application.startProcess( - "$name-$version", "$platform-$platformVersion", [exec, entryPoint, ...arg], env - ); - return app; -} - -Future saveAppConfig(Map config) async { - final name = config["name"]; - final version = config["version"]; - Map json = {}; - json["arg"] = config["arg"]; - json["env"] = config["env"]; - json["entryPoint"] = config["selectedEntryPoint"]; - json["exec"] = config["selectedExec"]; - json["platform"] = config["platform"]; - json["platformVersion"] = config["platformVersion"]; - await nodebase.instance.platform.writeApplicationConfig(name, version, json); -} \ No newline at end of file diff --git a/lib/comp/util.dart b/lib/comp/util.dart deleted file mode 100755 index cf23f99..0000000 --- a/lib/comp/util.dart +++ /dev/null @@ -1,44 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; - -SnackBar generateSnackBar(BuildContext context, String content, { - Duration duration = const Duration(seconds: 2) -}) { - final snackBar = SnackBar( - content: Text(content), - action: SnackBarAction( - label: "X", - onPressed: () { - // TODO: To safely refer to a widget's ancestor in its dispose() method, - // save a reference to the ancestor by calling dependOnInheritedWidgetOfExactType() - // in the widget's didChangeDependencies() method. - ScaffoldMessenger.of(context).hideCurrentSnackBar(); - } - ), - duration: duration, - ); - ScaffoldMessenger.of(context).showSnackBar(snackBar); - return snackBar; -} - -Future showConfirmDialog(BuildContext context, String title, String content) async { - final ok = Completer(); - final dialog = AlertDialog( - title: Text(title), - shape: const BeveledRectangleBorder(), - content: Text(content), - actions: [ - TextButton(onPressed: () { - Navigator.of(context).pop(); - ok.complete(false); - }, child: const Text("Cancel")), - ElevatedButton(onPressed: () { - Navigator.of(context).pop(); - ok.complete(true); - }, child: const Text("Confirm")), - ], - ); - showDialog(context: context, builder: (_) => dialog); - return ok.future; -} diff --git a/lib/ctrl/application_def.dart b/lib/ctrl/application_def.dart deleted file mode 100755 index 957a93c..0000000 --- a/lib/ctrl/application_def.dart +++ /dev/null @@ -1,18 +0,0 @@ -abstract class IApplicationProcess { - Future start(); - Future stop(); - Future syncState(); - bool isDead(); - String getName(); - String getPlatform(); - List getCmd(); - Map getEnv(); -} - -abstract class IApplication { - IApplicationProcess startProcess(String name, String platform, List cmd, Map env); - void stopProcess(String name); - IApplicationProcess? getApp(String name); - List getRunningApp(); - void dispose(); -} \ No newline at end of file diff --git a/lib/ctrl/application_local.dart b/lib/ctrl/application_local.dart deleted file mode 100755 index 0f4a701..0000000 --- a/lib/ctrl/application_local.dart +++ /dev/null @@ -1,120 +0,0 @@ -// manage application runtime - -import 'dart:async'; - -import './application_def.dart'; - -import '../util/api.dart'; - -class _ApplicationProcess implements IApplicationProcess { - _ApplicationProcess({ - required this.name, - required this.cmd, - this.platform = "-", - this.env = const {}, - }); - - String name; - List cmd; - Map env; - String platform; - String state = "new"; - - @override - String getName() => name; - @override - String getPlatform() => platform; - @override - List getCmd() => cmd; - @override - Map getEnv() => env; - - @override - Future start() async { - await NodeBaseApi.apiAppStart(name, cmd, env: env); - } - - @override - Future stop() async { - await NodeBaseApi.apiAppStop(name); - } - - @override - Future syncState() async { - final obj = await NodeBaseApi.apiAppStatus(name); - final r = obj["state"]; - state = r; - return r; - } - - @override - bool isDead() => state == "dead"; -} - -class ApplicationLocal implements IApplication { - late StreamSubscription listener; - - ApplicationLocal({ - required this.baseDir - }) { - _connect(); - } - - void _connect() { - listener = NodeBaseApi.event.receiveBroadcastStream("app").listen((message) { - if (message is List) { - final name = message[0]; - final state = message[1]; - final app = runtime[name]; - if (app != null && app is _ApplicationProcess) { - app.state = state; - if (state == "dead") runtime.remove(name); - } - } - }); - } - - @override - IApplicationProcess startProcess( - String name, - String platform, - List cmd, - Map env - ) { - final app = _ApplicationProcess(name: name, cmd: cmd, env: env, platform: platform); - // XXX: if we want sandbox to run applications, - // on windows, MacOS, maybe consider cygwin, winehq, WSL and docker impl - // on Linux, Android, consider proot - app.start(); - runtime[name] = app; - return app; - } - - @override - void stopProcess(String name) { - final app = runtime[name]; - if (app == null) return; - runtime.remove(name); - app.stop(); - } - - @override - IApplicationProcess? getApp(String name) => runtime[name]; - @override - List getRunningApp() { - final List r = []; - runtime.forEach((name, app) { - if (!app.isDead()) r.add(app); - }); - return r; - } - - @override - void dispose() { - listener.cancel(); - runtime.forEach((_, app) => app.stop()); - } - - String baseDir; - Map runtime = {}; -} \ No newline at end of file diff --git a/lib/ctrl/configure.dart b/lib/ctrl/configure.dart deleted file mode 100755 index 67c632e..0000000 --- a/lib/ctrl/configure.dart +++ /dev/null @@ -1,28 +0,0 @@ -bool localMode = true; - -/* - * /nodebase.json - * /plm--.json - * /plm///(-).json - * /app--.json - * /app///(-).json - */ -String defaultPlatformBaseUrl = "https://raw.githubusercontent.com/wiki/dna2github/NodeBase/market/v1"; -//String defaultPlatformBaseUrl = "http://127.0.0.1:8000"; - -/* - * /app/running GET - * /app/start POST - * /app/stop POST - * /app/stat GET - * /config/nodebase GET - * /config/list/plm GET - * /config/list/installed_plm GET - * /config/install/plm/ POST - * /config/meta/plm/ GET - * /config/list/app GET - * /config/list/installed_app GET - * /config/install/app/ POST - * /config/meta/app/ GET - */ -String defaultRemoteBaseUrl = "http://127.0.0.1:8580"; \ No newline at end of file diff --git a/lib/ctrl/nodebase.dart b/lib/ctrl/nodebase.dart deleted file mode 100755 index 28e13e5..0000000 --- a/lib/ctrl/nodebase.dart +++ /dev/null @@ -1,70 +0,0 @@ -import 'dart:developer'; -import 'dart:io'; - -import '../ctrl/application_def.dart'; -import '../ctrl/application_local.dart'; -import '../ctrl/platform_def.dart'; -import '../ctrl/platform_local.dart'; -import '../util/fs.dart'; -import '../util/api.dart'; -import '../util/event.dart' as event; -import './configure.dart'; - -class NodeBaseController { - late IApplication application; - late IPlatform platform; - bool isSupported = false; - - Future initializeApp() async { - if (localMode) { - await initLocalMode(); - } else { - // TODO: add PlatformRemote and ApplicationRemote for remote mode - } - - event.initializeToken.add(true); - } - - Future initLocalMode() async { - final parts = (await NodeBaseApi.apiUtilGetArch()).split("|")[0].split("-"); - String os = parts[0]; - String arch = parts[1]; - final appBaseDir = await fsGetBaseDir(); - var baseUrl = defaultPlatformBaseUrl; - // TODO: read app config and get default base url - platform = PlatformLocal(baseUrl: baseUrl, baseDir: appBaseDir, os: os, arch: arch); - application = ApplicationLocal(baseDir: appBaseDir); - try { - // TODO: read user settings, app list, platform list - // get latest app, platform list from remote - final download = platform.downloadNodeBaseJson(); - if (!File(platform.getNodeBaseJsonFilename()).existsSync()) { - await download; - } - } catch (e) { - log("NodeBase [E] cannot download nodebase.json"); - } - isSupported = await platform.isSupported(); - // TODO: check platform version; if no change, skip download list - try { - final download = platform.downloadApplicationListJson(); - if (!File(platform.getApplicationListJsonFilename()).existsSync()) { - await download; - } - } catch(e) { - log("NodeBase [E] cannot download app-list.json"); - } - - try { - final download = platform.downloadPlatformListJson(); - if (!File(platform.getPlatformListJsonFilename()).existsSync()) { - await download; - } - } catch(e) { - log("NodeBase [E] cannot download plm-list.json"); - } - } - -} - -final instance = NodeBaseController(); \ No newline at end of file diff --git a/lib/ctrl/platform_def.dart b/lib/ctrl/platform_def.dart deleted file mode 100755 index 3bd7483..0000000 --- a/lib/ctrl/platform_def.dart +++ /dev/null @@ -1,36 +0,0 @@ -import 'dart:async'; - -abstract class IPlatform { - void changeBaseUrl(String url); - Future isSupported(); - String getName(); - String getNodeBaseJsonFilename(); - String getApplicationListJsonFilename(); - String getPlatformListJsonFilename(); - Future getApplicationBaseDir(String name, String version); - Future getPlatformBaseDir(String name, String version); - Future> readNodeBaseJson(); - Future> readApplicationListJson(); - Future> readPlatformListJson(); - Future> readApplicationMetaJson(String name, String version); - Future> readPlatformMetaJson(String name, String version); - Future downloadNodeBaseJson({StreamController? cancel}); - Future downloadApplicationListJson({StreamController? cancel}); - Future downloadPlatformListJson({StreamController? cancel}); - Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}); - Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}); - Future downloadApplicationBinary(String name, String version, String platform, String url, {StreamController? cancel}); - Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}); - Future downloadCancel(String targetFilename); - Future>> listAvailableApplicationList(); - Future>> listInstalledApplicationList(); - Future> readApplicationConfig(String name, String version); - Future writeApplicationConfig(String name, String version, Map json); - Future removeApplicationBinary(String name, String version, String platform); - Future>> listAvailablePlatformList(); - Future>> listInstalledPlatformList(); - Future> listPlatformExecutableList(String name, String version); - Future> readPlatformConfig(String name, String version); - Future writePlatformConfig(String name, String version, Map json); - Future removePlatformBinary(String name, String version); -} \ No newline at end of file diff --git a/lib/ctrl/platform_local.dart b/lib/ctrl/platform_local.dart deleted file mode 100755 index 8cf472f..0000000 --- a/lib/ctrl/platform_local.dart +++ /dev/null @@ -1,540 +0,0 @@ -// manage platform like executable files, application files - -import 'dart:async'; -import 'dart:io'; -import 'package:path/path.dart' as path; - -import './platform_def.dart'; -import '../util/api.dart'; -import '../util/fs.dart'; -import '../util/event.dart' as event; - -/* - * == remote == - * /nodebase.json -> /workspace/tmp/nodebase.json - * - version - * - platform-- - * e.g. - * - version: 1.0 - * - platform-android-arm64: 20240101 - * - * /app--.json -> /workspace/tmp/app--.json - * - name - * - version - * /plm--.json -> /workspace/tmp/plm--.json - * - name - * - version - * /app///(-).json - * - url - * - sha256 - * - description - * - timestamp - * - entry - * /plm///(-).json - * - url - * - sha256 - * - description - * - timestamp - * - entry - * - * == local == - * /workspace/etc/nodebase/app.json - * - version - * - sources - * /workspace/etc/nodebase/sources/plm/().list - * /workspace/etc/nodebase/plm/all.list - * - name - * - version - * - source - * - meta_json - * /workspace/etc/nodebase/plm/(-).json - * - name - * - version - * - manifest (files, directories) - * - filename - * - type=exe,none - * /workspace/etc/nodebase/sources/app/().list - * /workspace/etc/nodebase/app/all.list - * - name - * - version - * - source - * - meta_json - * /workspace/etc/nodebase/app/(-).json - * - name - * - version - * - requirements - * - platform - * /workspace/etc/plm/(-)/... - * - name - * - version - * - source - * - executable - * - filename - * - type=exe,none - * /workspace/etc/app/(-)/... - * /workspace/app/... - * /workspace/plm/... - */ - -class _DownloadItem { - _DownloadItem({ - required this.action, - required this.cancel, - }); - - final Completer action; - final StreamController cancel; -} - -class PlatformLocal implements IPlatform { - PlatformLocal({ - required this.baseUrl, - required this.baseDir, - required this.os, - required this.arch}); - String baseUrl; - String baseDir; - String os; - String arch; - - final Map _downloadQueue = {}; - - @override - String getName() => "$os-$arch"; - - String _getEtcBaseDir() => path.join(baseDir, "workspace", "etc"); - String _getTmpBaseDir() => path.join(baseDir, "workspace", "tmp"); - String _getApplicationBaseDir() => path.join(baseDir, "workspace", "app"); - String _getPlatformBaseDir() => path.join(baseDir, "workspace", "plm"); - - @override - String getNodeBaseJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "nodebase.json"); - @override - String getApplicationListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); - @override - String getPlatformListJsonFilename() => path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); - - @override - void changeBaseUrl(String url) { baseUrl = url; } - Future isSupported() async { - final config = await readNodeBaseJson(); - return config.containsKey("platform-$os-$arch"); - } - - @override - Future getApplicationBaseDir(String name, String version) async { - return path.join(_getApplicationBaseDir(), await fsCalcStringHash("$name-$version")); - } - @override - Future getPlatformBaseDir(String name, String version) async { - return path.join(_getPlatformBaseDir(), await fsCalcStringHash("$name-$version")); - } - - @override - Future> readNodeBaseJson() async => - fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "nodebase.json")); - @override - Future> readApplicationListJson() async => - fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json")); - @override - Future> readPlatformListJson() async => - fsReadFileAsJson(path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json")); - @override - Future> readApplicationMetaJson(String name, String version) async => - fsReadFileAsJson(path.join(_getEtcBaseDir(), "app", await fsCalcStringHash("$name-$version"), "meta.json")); - @override - Future> readPlatformMetaJson(String name, String version) async => - fsReadFileAsJson(path.join(_getEtcBaseDir(), "plm", await fsCalcStringHash("$name-$version"), "meta.json")); - - Future _downloadFile( - String name, - String url, - String targetFilename, - StreamController? cancel) async { - final signal = StreamController(); - cancel ??= StreamController(); - await fsGuaranteeDir(targetFilename); - event.platformToken.add(["download", name, url, targetFilename, 0]); - final download = fsProgressDownload(targetFilename, url, signal, cancel); - signal.stream.listen((message) { - final progress = message[2]; - final len = message[1]; - final cur = message[0]; - if (progress == -1) { - // cancel or error - event.platformToken.add(["download", name, url, targetFilename, -1]); - } else if (len == 0) { - if (cur == 0) event.platformToken.add(["download", name, url, targetFilename, -99]); - } else { - event.platformToken.add(["download", name, url, targetFilename, progress]); - } - }); - return download; - } - @override - Future downloadNodeBaseJson({StreamController? cancel}) async { - final tmpFilename = path.join(_getTmpBaseDir(), "nodebase.json"); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("nodebase.json", "$baseUrl/nodebase.json", tmpFilename, cancel); - final targetFilename = getNodeBaseJsonFilename(); - await fsGuaranteeDir(targetFilename); - final tmpFile = File(tmpFilename); - await tmpFile.copy(targetFilename); - await tmpFile.delete(); - action.complete(); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadApplicationListJson({StreamController? cancel}) async { - final tmpFilename = path.join(_getTmpBaseDir(), "app-$os-$arch.json"); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("app-$os-$arch.json", "$baseUrl/app-$os-$arch.json", tmpFilename, cancel); - final targetFilename = getApplicationListJsonFilename(); - await fsGuaranteeDir(targetFilename); - final tmpFile = File(tmpFilename); - await tmpFile.copy(targetFilename); - await tmpFile.delete(); - action.complete(); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadPlatformListJson({StreamController? cancel}) async { - final tmpFilename = path.join(_getTmpBaseDir(), "plm-$os-$arch.json"); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("plm-$os-$arch.json", "$baseUrl/plm-$os-$arch.json", tmpFilename, cancel); - final targetFilename = getPlatformListJsonFilename(); - await fsGuaranteeDir(targetFilename); - final tmpFile = File(tmpFilename); - await tmpFile.copy(targetFilename); - await tmpFile.delete(); - action.complete(); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadApplicationMetaJson(String name, String version, {StreamController? cancel}) async { - // python3 -c 'from hashlib import sha256; x="node-v20.11.0";print(x, sha256(x.encode("utf-8")).hexdigest())' - final hash = await fsCalcStringHash("$name-$version"); - final tmpFilename = path.join(_getTmpBaseDir(), "app-$hash-meta.json"); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("app-$name-$version.json", "$baseUrl/app/$os/$arch/$hash.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "app", hash, "meta.json"); - await fsGuaranteeDir(targetFilename); - final tmpFile = File(tmpFilename); - await tmpFile.copy(targetFilename); - await tmpFile.delete(); - action.complete(); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadPlatformMetaJson(String name, String version, {StreamController? cancel}) async { - final hash = await fsCalcStringHash("$name-$version"); - final tmpFilename = path.join(_getTmpBaseDir(), "plm-$hash-meta.json"); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("plm-$name-$version.json", "$baseUrl/plm/$os/$arch/$hash.json", tmpFilename, cancel); - final targetFilename = path.join(_getEtcBaseDir(), "plm", hash, "meta.json"); - await fsGuaranteeDir(targetFilename); - final tmpFile = File(tmpFilename); - await tmpFile.copy(targetFilename); - await tmpFile.delete(); - action.complete(); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadApplicationBinary(String name, String version, String platform, String url, {StreamController? cancel}) async { - final hash = await fsCalcStringHash("$name-$version"); - final baseName = path.basename(url); - final tmpFilename = path.join(_getTmpBaseDir(), baseName); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("app-$name-$version.bin", url, tmpFilename, cancel); - final tmpFile = File(tmpFilename); - Function(String, String)? unzipFn; - if (baseName.endsWith(".zip")) { - unzipFn = fsUnzipFiles; - } else if (baseName.endsWith(".tar")) { - unzipFn = fsUnzipTarFiles; - } else if (baseName.endsWith(".tar.xz")) { - unzipFn = fsUnzipXzTarFiles; - } else if (baseName.endsWith(".tar.gz") || baseName.endsWith(".tgz")) { - unzipFn = fsUnzipGzTarFiles; - } else if (baseName.endsWith(".tar.bz2") || baseName.endsWith(".tbz2")) { - unzipFn = fsUnzipBzTarFiles; - } - if (unzipFn == null) { - final targetFilename = path.join(_getApplicationBaseDir(), hash, baseName); - await fsGuaranteeDir(targetFilename); - await tmpFile.copy(targetFilename); - } else { - final targetFilename = path.join(_getApplicationBaseDir(), hash); - await fsMkdir(targetFilename); - await unzipFn(tmpFilename, targetFilename); - } - await tmpFile.delete(); - await _configListAdd("app-list.json", name, "$version:$platform"); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadPlatformBinary(String name, String version, String url, {StreamController? cancel}) async { - final hash = await fsCalcStringHash("$name-$version"); - final baseName = path.basename(url); - final tmpFilename = path.join(_getTmpBaseDir(), baseName); - final doing = _downloadQueue[tmpFilename]; - if (doing != null) return await doing.action.future; - final action = Completer(); - cancel ??= StreamController(); - _downloadQueue[tmpFilename] = _DownloadItem(action: action, cancel: cancel); - try { - await _downloadFile("plm-$name-$version.bin", url, tmpFilename, cancel); - final tmpFile = File(tmpFilename); - Function(String, String)? unzipFn; - if (baseName.endsWith(".zip")) { - unzipFn = fsUnzipFiles; - } else if (baseName.endsWith(".tar")) { - unzipFn = fsUnzipTarFiles; - } else if (baseName.endsWith(".tar.xz")) { - unzipFn = fsUnzipXzTarFiles; - } else if (baseName.endsWith(".tar.gz") || baseName.endsWith(".tgz")) { - unzipFn = fsUnzipGzTarFiles; - } else if (baseName.endsWith(".tar.bz2") || baseName.endsWith(".tbz2")) { - unzipFn = fsUnzipBzTarFiles; - } - if (unzipFn == null) { - final targetFilename = path.join(_getPlatformBaseDir(), hash, baseName); - await fsGuaranteeDir(targetFilename); - await tmpFile.copy(targetFilename); - await NodeBaseApi.apiUtilMarkExecutable(targetFilename); - } else { - final targetFilename = path.join(_getPlatformBaseDir(), hash); - await fsMkdir(targetFilename); - await unzipFn(tmpFilename, targetFilename); - for (final fname in await listPlatformExecutableList(name, version)) { - await NodeBaseApi.apiUtilMarkExecutable(path.join(targetFilename, fname)); - } - } - await tmpFile.delete(); - await _configListAdd("plm-list.json", name, version); - } catch (e) { - action.completeError(e); - } finally { - _downloadQueue.remove(tmpFilename); - } - } - @override - Future downloadCancel(String targetFilename) async { - final doing = _downloadQueue[targetFilename]; - if (doing == null) return; - doing.cancel.add(true); - await doing.action.future; - } - - Future _configListAdd(String target, String name, String version) async { - final filename = path.join(_getEtcBaseDir(), "nodebase", target); - final config = await fsReadFileAsJson(filename); - List list_ = config["items"] ?? []; - List list = []; - for (final one in list_) { - list.add(one.toString()); - } - final addone = "$name-$version"; - if (!list.contains(addone)) list.add(addone); - config["items"] = list; - await fsWriteFileAsJson(filename, config); - } - Future _configListRemove(String target, String name, String version) async { - final filename = path.join(_getEtcBaseDir(), "nodebase", target); - final config = await fsReadFileAsJson(filename); - List list_ = config["items"] ?? []; - List list = []; - for (final one in list_) { - list.add(one.toString()); - } - final addone = "$name-$version"; - int i = list.indexOf(addone); - if (i >= 0) { - list.removeAt(i); - } - config["items"] = list; - await fsWriteFileAsJson(filename, config); - } - - @override - Future>> listAvailableApplicationList() async { - // name-version:platform - final filename = path.join(_getEtcBaseDir(), "nodebase", "app-$os-$arch.json"); - final config = await fsReadFileAsJson(filename); - Map> r = {}; - for (final one in config["items"] ?? []) { - final onestr = one.toString(); - final i = onestr.indexOf('-'); - final name = onestr.substring(0, i); - final version = onestr.substring(i+1); - if (r.containsKey(name)) { - r[name]?.add(version); - } else { - r[name] = [version]; - } - } - return r; - } - @override - Future>> listInstalledApplicationList() async { - final filename = path.join(_getEtcBaseDir(), "nodebase", "app-list.json"); - final config = await fsReadFileAsJson(filename); - Map> r = {}; - for (final one in config["items"] ?? []) { - final onestr = one.toString(); - final i = onestr.indexOf('-'); - final name = onestr.substring(0, i); - final version = onestr.substring(i+1); - if (r.containsKey(name)) { - r[name]?.add(version); - } else { - r[name] = [version]; - } - } - return r; - } - @override - Future> readApplicationConfig(String name, String version) async { - final hash = await fsCalcStringHash("$name-$version"); - final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); - return await fsReadFileAsJson(filename); - } - @override - Future writeApplicationConfig(String name, String version, Map json) async { - final hash = await fsCalcStringHash("$name-$version"); - final filename = path.join(_getEtcBaseDir(), "app", hash, "config.json"); - await fsWriteFileAsJson(filename, json); - } - @override - Future removeApplicationBinary(String name, String version, String platform) async { - final hash = await fsCalcStringHash("$name-$version"); - final dir = Directory(path.join(_getApplicationBaseDir(), hash)); - await _configListRemove("app-list.json", name, "$version:$platform"); - if (!dir.existsSync()) return; - await dir.delete(recursive: true); - } - - @override - Future>> listAvailablePlatformList() async { - final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-$os-$arch.json"); - final config = await fsReadFileAsJson(filename); - Map> r = {}; - for (final one in config["items"] ?? []) { - final onestr = one.toString(); - final i = onestr.indexOf('-'); - final name = onestr.substring(0, i); - final version = onestr.substring(i+1); - if (r.containsKey(name)) { - r[name]?.add(version); - } else { - r[name] = [version]; - } - } - return r; - } - @override - Future>> listInstalledPlatformList() async { - // name-version - final filename = path.join(_getEtcBaseDir(), "nodebase", "plm-list.json"); - final config = await fsReadFileAsJson(filename); - Map> r = {}; - for (final one in config["items"] ?? []) { - final onestr = one.toString(); - final i = onestr.indexOf('-'); - final name = onestr.substring(0, i); - final version = onestr.substring(i+1); - if (r.containsKey(name)) { - r[name]?.add(version); - } else { - r[name] = [version]; - } - } - return r; - } - @override - Future> listPlatformExecutableList(String name, String version) async { - final meta = await readPlatformMetaJson(name, version); - List r = []; - for (final one in meta["executable"] ?? []) { - r.add(one.toString()); - } - return r; - } - @override - Future> readPlatformConfig(String name, String version) async { - final hash = await fsCalcStringHash("$name-$version"); - final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); - return await fsReadFileAsJson(filename); - } - @override - Future writePlatformConfig(String name, String version, Map json) async { - final hash = await fsCalcStringHash("$name-$version"); - final filename = path.join(_getEtcBaseDir(), "plm", hash, "config.json"); - await fsWriteFileAsJson(filename, json); - } - @override - Future removePlatformBinary(String name, String version) async { - final hash = await fsCalcStringHash("$name-$version"); - final dir = Directory(path.join(_getPlatformBaseDir(), hash)); - await _configListRemove("plm-list.json", name, version); - if (!dir.existsSync()) return; - // XXX: by default, on windows, MAX_PATh = 260, if too long, will fail - // ref: https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry - // ref: https://stackoverflow.com/questions/3277717/c-winapi-handling-long-file-paths-names (prefix \\?\) - await dir.delete(recursive: true); - } -} diff --git a/lib/main.dart b/lib/main.dart deleted file mode 100755 index fbe025f..0000000 --- a/lib/main.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:flutter/material.dart'; -import './page/splash.dart'; - -void main() { - runApp(const NodeBaseApp()); -} - -class NodeBaseApp extends StatelessWidget { - const NodeBaseApp({super.key}); - - // This widget is the root of your application. - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'NodeBase', - theme: ThemeData( - // This is the theme of your application. - // - // TRY THIS: Try running your application with "flutter run". You'll see - // the application has a purple toolbar. Then, without quitting the app, - // try changing the seedColor in the colorScheme below to Colors.green - // and then invoke "hot reload" (save your changes or press the "hot - // reload" button in a Flutter-supported IDE, or press "r" if you used - // the command line to start the app). - // - // Notice that the counter didn't reset back to zero; the application - // state is not lost during the reload. To reset the state, use hot - // restart instead. - // - // This works for code too, not just values: Most code changes can be - // tested with just a hot reload. - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - useMaterial3: true, - ), - home: const SplashPage(), - ); - } -} diff --git a/lib/page/not_supported.dart b/lib/page/not_supported.dart deleted file mode 100755 index e5cddd4..0000000 --- a/lib/page/not_supported.dart +++ /dev/null @@ -1,71 +0,0 @@ -import 'dart:io'; - -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import '../ctrl/nodebase.dart' as nodebase; - -class NotSupportedPage extends StatefulWidget { - const NotSupportedPage({super.key}); - - @override - State createState() => _NotSupportedPageState(); -} - -class _NotSupportedPageState extends State { - @override - Widget build(BuildContext context) { - return Scaffold( - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const Image(image: AssetImage('asset/image/logo.png')), - const Text( - "\nNodeBase", - style: TextStyle(fontSize: 24, color: Color.fromARGB(128, 0, 0, 0)), - ), - Row( - children: [ - const Spacer(), - Row( - children: [ - Column( - children: [ - const Text( - "Sorry, we are not yet have", - style: TextStyle(color: Color.fromARGB(128, 0, 0, 0)), - ), - Row( - children: [ - const Text( - "support for ", - style: TextStyle(color: Color.fromARGB(128, 0, 0, 0)), - ), - Text( - "\"${nodebase.instance.platform.getName()}\"", - style: const TextStyle(color: Color.fromARGB(255, 255, 128, 128)), - ), - ], - ), - const Text(" "), - ], - ), - ] - ), - const Spacer(), - ], - ), - ElevatedButton(onPressed: () => { - if (Platform.isAndroid) { - SystemChannels.platform.invokeMethod('SystemNavigator.pop') - } else { - exit(0) - } - }, child: const Text("Exit")) - ], - ), - ), - ); - } -} \ No newline at end of file diff --git a/lib/page/primay.dart b/lib/page/primay.dart deleted file mode 100755 index bff9cf2..0000000 --- a/lib/page/primay.dart +++ /dev/null @@ -1,362 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import '../util/api.dart'; -import '../util/event.dart' as event; -import '../ctrl/nodebase.dart' as nodebase; -import '../comp/app_runtime_tile.dart'; -import '../comp/download_tile.dart'; -import '../comp/app_tile.dart'; -import '../comp/platform_tile.dart'; - -class PrimaryPage extends StatefulWidget { - const PrimaryPage({super.key}); - - @override - State createState() => _PrimaryPageState(); -} - -class _PrimaryPageState extends State { - List runtimeList = []; - List downloadList = []; - List appList = []; - List plmList = []; - - late StreamSubscription downloadProgress; - late StreamSubscription applicationEvent; - - updateDependencyState() { - Map appRef = {}; - Map plmRef = {}; - for (final one in appList) { - appRef["${one.name}-${one.version}"] = 0; - } - for (final one in plmList) { - plmRef["${one.name}-${one.version}"] = 0; - } - for (final one in runtimeList) { - appRef[one.process.getName()] = (appRef[one.process.getName()] ?? 0) + 1; - plmRef[one.process.getPlatform()] = (plmRef[one.process.getName()] ?? 0) + 1; - } - for (int i = 0, n = appList.length; i < n; i++) { - final one = appList[i]; - final running = (appRef["${one.name}-${one.version}"] ?? 0) > 0; - if (running != one.defaultRunning) { - appList[i] = AppTile( - name: one.name, - version: one.version, - platform: one.platform, - defaultInstalled: one.defaultInstalled, - defaultRunning: running - ); - } - } - for (int i = 0, n = plmList.length; i < n; i++) { - final one = plmList[i]; - final running = (plmRef["${one.name}-${one.version}"] ?? 0) > 0; - if (running != one.defaultRunning) { - plmList[i] = PlatformTile( - name: one.name, - version: one.version, - defaultInstalled: one.defaultInstalled, - defaultRunning: running - ); - } - } - } - - @override - void initState() { - super.initState(); - - downloadProgress = event.platformToken.stream.listen((msg) { - final T = msg[0]; - if (T != "download") return; - final tnv = msg[1]; - if (tnv is! String) return; - if (!tnv.endsWith(".bin")) return; - final parts = tnv.substring(0, tnv.length - 4).split("-"); - // TODO: check parts.length - final type = parts[0] == "app" ? "application" : "platform"; - final name = "${parts[1]}-${parts[2]}"; - final url = msg[2]; - final filename = msg[3]; - final val = msg[4]; - try { - final mark = downloadList.firstWhere( - (one) => one.url == url && - one.filename == filename, - ); - if (val >= 1) { - final i = downloadList.indexOf(mark); - if (i >= 0) { - setState(() { - downloadList.removeAt(i); - }); - } - } else if (val == -1) { - // cancel or error - final i = downloadList.indexOf(mark); - if (i >= 0) { - setState(() { - downloadList.removeAt(i); - }); - } - } - } catch (e) { - if (val >= 0 && val < 1) { - setState(() { - downloadList.add(DownloadTile(name: name, type: type, url: url, filename: filename)); - }); - } - } - }); - - applicationEvent = NodeBaseApi.event.receiveBroadcastStream("app").listen((message) { - final cmd = message[0]; - final nameVersion = message[1]; - final app = nodebase.instance.application.getApp(nameVersion); - AppRuntimeTile? tile; - try { - tile = runtimeList.firstWhere((one) => one.process == app || one.process.getName() == nameVersion); - } catch(err) { - tile = null; - } - switch(cmd) { - case "start": - if (app == null || tile != null) return; - runtimeList.add(AppRuntimeTile(process: app)); - updateDependencyState(); - setState(() {}); - break; - case "stop": - if (tile == null) return; - final i = runtimeList.indexOf(tile); - runtimeList.removeAt(i); - updateDependencyState(); - setState(() {}); - break; - } - }); - - initPlatformList(); - initApplicationList(); - } - - @override - void dispose() { - downloadProgress.cancel(); - applicationEvent.cancel(); - super.dispose(); - } - - void initPlatformList() { - (() async { - final platform = nodebase.instance.platform; - return await Future.wait([ - platform.listAvailablePlatformList(), - platform.listInstalledPlatformList(), - ]); - })().then((list) { - final [listAp, listIp] = list; - final List r = []; - listIp.forEach((name, versions) { - for (final version in versions) { - if (listAp.containsKey(name) && listAp[name]!.contains(version)) continue; - final p = PlatformTile( - name: name, - version: version, - defaultInstalled: true, - userDefined: true - ); - r.add(p); - } - }); - listAp.forEach((name, versions) { - for (final version in versions) { - final installed = listIp.containsKey(name) && listIp[name]!.contains(version); - final p = PlatformTile( - name: name, - version: version, - defaultInstalled: installed, - userDefined: false - ); - r.add(p); - } - }); - // TODO: sort r and installed ones should at top - setState(() { - plmList.clear(); - plmList.addAll(r); - }); - }); - } - - void initApplicationList() { - (() async { - final platform = nodebase.instance.platform; - return await Future.wait([ - platform.listAvailableApplicationList(), - platform.listInstalledApplicationList(), - ]); - })().then((list) { - final [listAa, listIa] = list; - final List r = []; - listIa.forEach((name, vps) { - for (final vp in vps) { - if (listAa.containsKey(name) && listAa[name]!.contains(vp)) continue; - final i = vp.indexOf(':'); - final version = vp.substring(0, i); - final platform = vp.substring(i+1); - final a = AppTile( - name: name, - version: version, - defaultInstalled: true, - platform: platform, - userDefined: true - ); - r.add(a); - } - }); - listAa.forEach((name, vps) { - for (final vp in vps) { - final i = vp.indexOf(':'); - final version = vp.substring(0, i); - final platform = vp.substring(i+1); - final installed = listIa.containsKey(name) && listIa[name]!.contains(vp); - final a = AppTile( - name: name, - version: version, - defaultInstalled: installed, - platform: platform, - userDefined: false - ); - r.add(a); - } - }); - setState(() { - appList.clear(); - appList.addAll(r); - }); - }); - } - - List buildRunningView(BuildContext context) { - final List runningView = [ - const Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Wrap( - spacing: 2, - children: [ - Text(" "), - Icon(Icons.directions_run), - Text(" Running"), - ], - ), - ], - ), - ]; - if (runtimeList.isNotEmpty) { - runningView.add( - ListView.builder( - itemCount: runtimeList.length, - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) => runtimeList[index] - ), - ); - } - if (downloadList.isNotEmpty) { - runningView.add( - ListView.builder( - itemCount: downloadList.length, - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) => downloadList[index] - ), - ); - } - return runningView; - } - - List buildApplicationView(BuildContext context) { - final List appView = [ - const Divider(), - const Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Wrap( - spacing: 2, - children: [ - Text(" "), - Icon(Icons.extension_rounded), - Text(" Application"), - ], - ), - ], - ), - ]; - if (appList.isNotEmpty) { - appView.add( - ListView.builder( - itemCount: appList.length, - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) => appList[index] - ), - ); - } - return appView; - } - - List buildPlatformView(BuildContext context) { - final List plmView = [ - const Divider(), - const Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Wrap( - spacing: 2, - children: [ - Text(" "), - Icon(Icons.apps), - Text(" Platform"), - ], - ), - ], - ), - ]; - if (plmList.isNotEmpty) { - plmView.add( - ListView.builder( - itemCount: plmList.length, - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) => plmList[index] - ), - ); - } - return plmView; - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - // TRY THIS: Try changing the color here to a specific color (to - // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar - // change color while the other colors stay the same. - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: const Text("NodeBase"), - ), - body: SingleChildScrollView( - child: Column( - children: [ - ...buildRunningView(context), - ...buildApplicationView(context), - ...buildPlatformView(context), - ], - ), - ), - ); - } -} \ No newline at end of file diff --git a/lib/page/splash.dart b/lib/page/splash.dart deleted file mode 100755 index 1a3e60f..0000000 --- a/lib/page/splash.dart +++ /dev/null @@ -1,88 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import './not_supported.dart'; -import './primay.dart'; -import '../util/event.dart' as event; -import '../ctrl/nodebase.dart' as nodebase; - -class SplashPage extends StatefulWidget { - const SplashPage({super.key}); - - @override - State createState() => _SplashPageState(); -} - -class _SplashPageState extends State { - late StreamSubscription initListener; - Completer initCompleter = Completer(); - - @override - void initState() { - super.initState(); - nodebase.instance.initializeApp(); - initListener = event.initializeToken.stream.listen((event) { - if (!initCompleter.isCompleted) { - initCompleter.complete(); - } - }); - splashWait().then((_) { - if (nodebase.instance.isSupported) { - Navigator.pushAndRemoveUntil( - context, - MaterialPageRoute(builder: (context) => const PrimaryPage()), - (Route route) => false, - ); - } else { - Navigator.pushAndRemoveUntil( - context, - MaterialPageRoute(builder: (context) => const NotSupportedPage()), - (Route route) => false, - ); - } - }); - // debug: Future.delayed(const Duration(seconds: 8)).then((_) => event.initializeToken.add(true)); - } - - @override - void dispose() { - initListener.cancel(); - super.dispose(); - } - - Future splashWait() async { - // at least, splash wait for N seconds, N = 3 - // at least, guarantee init complete - Future delay = Future.delayed(const Duration(seconds: 3)); - await Future.any([initCompleter.future, delay]); - if (initCompleter.isCompleted) { - await delay; - } else { - await initCompleter.future; - } - } - - @override - Widget build(BuildContext context) { - return const Scaffold( - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image(image: AssetImage('asset/image/logo.png')), - Text( - "\nNodeBase", - style: TextStyle(fontSize: 24, color: Color.fromARGB(128, 0, 0, 0)), - ), - Text( - "Connect the world with friends", - style: TextStyle(color: Color.fromARGB(65, 0, 0, 0)), - ), - ], - ), - ), - ); - } - -} diff --git a/lib/util/api.dart b/lib/util/api.dart deleted file mode 100755 index 8f2aaae..0000000 --- a/lib/util/api.dart +++ /dev/null @@ -1,106 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/services.dart'; -import 'dart:developer'; - -class NodeBaseApi { - static const api = MethodChannel('net.seven.nodebase/app'); - static const event = EventChannel('net.seven.nodebase/event'); - - static Future> apiUtilGetIPs() async { - /* { - : ["", "", ...] - } */ - try { - var json = await api.invokeMethod('util.ip'); - Map r = {}; - json.forEach((key, value) { - r[key.toString()] = value; - }); - return Future.value(r); - } catch (e) { - log("NodeBase [E] getIPs / ${e.toString()}"); - return {}; - } - } - - static Future apiUtilMarkExecutable(String filename) async { - try { - await api.invokeMethod( - 'util.file.executable', - {"filename": filename} - ); - } catch (e) { - log("NodeBase [E] utilMarkExecutable / ${e.toString()}"); - } - } - - static Future apiUtilGetArch() async { - try { - return await api.invokeMethod("util.arch"); - } catch(e) { - log("NodeBase [E] utilGetArch / ${e.toString()}"); - return ""; - } - } - - static Future apiUtilGetWorkspacePath() async { - try { - return await api.invokeMethod("util.workspace"); - } catch(e) { - log("NodeBase [E] utilGetWorkspacePath / ${e.toString()}"); - return ""; - } - } - - static Future> apiAppStatus(String app) async { - /* { - state: "none" | "new" | "running" | "dead" - } */ - try { - var json = await api.invokeMethod('app.stat', {"name": app}); - Map r = {}; - json.forEach((key, value) { - r[key.toString()] = value; - }); - return r; - } catch (e) { - log("NodeBase [E] appStatus / ${e.toString()}"); - return {}; - } - } - - static Future apiAppStart( - String app, - List cmd, - { Map env = const {} } - ) async { - try { - await api.invokeMethod( - 'app.start', {"name": app, "cmd": cmd, "env": env} - ); - } catch (e) { - log("NodeBase [E] appStart / ${e.toString()}"); - } - } - - static Future apiAppStop(String app) async { - try { - await api.invokeMethod( - 'app.stop', {"name": app} - ); - } catch (e) { - log("NodeBase [E] appStop / ${e.toString()}"); - } - } - - static Future apiAppOpenBrowser(String url) async { - try { - api.invokeMethod('util.browser.open', { - "url": url, - }); - } catch (e) { - log("NodeBase [E] appOpenBrowser / ${e.toString()}"); - } - } -} \ No newline at end of file diff --git a/lib/util/event.dart b/lib/util/event.dart deleted file mode 100755 index 70d1bcb..0000000 --- a/lib/util/event.dart +++ /dev/null @@ -1,4 +0,0 @@ -import 'dart:async'; - -final initializeToken = StreamController.broadcast(); -final platformToken = StreamController.broadcast(); \ No newline at end of file diff --git a/lib/util/fs.dart b/lib/util/fs.dart deleted file mode 100755 index aadfcf3..0000000 --- a/lib/util/fs.dart +++ /dev/null @@ -1,352 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; -import 'dart:developer'; - -import 'package:archive/archive.dart'; -import 'package:crypto/crypto.dart'; -import 'package:path/path.dart' as path; - -import './api.dart'; - -// getApplicationDocumentsDirectory -> /data/data/app/... -// getExternalStorageDirectory -> /storage/sdcard-external/android/data/app/... - -var _appPath_ = ""; -Future get _appPath async { - if (_appPath_ != "") return _appPath_; - _appPath_ = await NodeBaseApi.apiUtilGetWorkspacePath(); - log("NodeBase [I] app path: $_appPath_"); - return _appPath_; -} - -Future fsGetBaseDir() async { - return await _appPath; -} - -Future fsReadFileAsString(filepath) async { - try { - final baseDir = await _appPath; - if (!filepath.startsWith(baseDir)) return ""; - final file = File(filepath); - String contents = await file.readAsString(); - return contents; - } catch (e) { - log("NodeBase [E] fsReadAppFileAsString ... ${e.toString()}"); - return ""; - } -} - -Future fsWriteFileAsString(filepath, contents) async { - final baseDir = await _appPath; - if (!filepath.startsWith(baseDir)) return; - final file = File(filepath); - file.writeAsString(contents); -} - -Future> fsReadFileAsJson(String filepath) async { - Map r = {}; - try { - final baseDir = await _appPath; - if (!filepath.startsWith(baseDir)) return r; - final text = await fsReadFileAsString(filepath); - r = jsonDecode(text); - } catch(e) { - log("NodeBase [E] fsReadFileAsString ... $e"); - } - return r; -} - -Future fsWriteFileAsJson(String filepath, Map config) async { - final f = File(filepath); - try { - await fsGuaranteeDir(f.path); - final text = jsonEncode(config); - await fsWriteFileAsString(filepath, text); - } catch(e) { - log("NodeBase [E] fsWriteFileAsString ... $e"); - } - return f; -} - -Future fsGetEntity(filepath) async { - final base = await _appPath; - final filename = path.join(base, filepath); - final T = await FileSystemEntity.type(filename); - if (T == FileSystemEntityType.notFound) { - return "notFound"; - } - if (T == FileSystemEntityType.link) { - return Link(filepath); - } - if (T == FileSystemEntityType.file) { - return File(filepath); - } - return Directory(filepath); -} - -Future fsMkdir(filepath) async { - final base = await _appPath; - return await Directory(path.join(base, filepath)).create(recursive: true); -} - -Future> fsLs(filepath) async { - final base = await _appPath; - final filename = path.join(base, filepath); - final list = []; - final T = await FileSystemEntity.type(filename); - if (T == FileSystemEntityType.notFound) { - } else if (T == FileSystemEntityType.link) { - // ignore files under link directory - list.add(Link(filename)); - } else if (T == FileSystemEntityType.file) { - list.add(File(filename)); - } else { - final dir = Directory(filename); - final entities = await dir.list(recursive: false, followLinks: false).toList(); - for (var entity in entities) { - list.add(entity); - } - } - return list; -} - -Future fsGetAppBaseDir(String app) async { - // TODO: check ".." in app - final base = await _appPath; - final appBaseDir = path.join(base, "apps", app); - return appBaseDir; -} - -Future fsRemoveApp(String app) async { - // TODO: check ".." in app - if (app == "") return false; - final base = await _appPath; - final appBaseDir = path.join(base, "apps", app); - final dir = Directory(appBaseDir); - if (await dir.exists()) { - await dir.delete(recursive: true); - } - return true; -} - -Future fsMoveApp(String app, String newname) async { - // TODO: check ".." in app and newname - if (app == "" || newname == "" || app == newname) return false; - final base = await _appPath; - final appBaseDir = path.join(base, "apps", app); - final newBaseDir = path.join(base, "app", newname); - final dir = Directory(appBaseDir); - if (await dir.exists()) { - await dir.rename(newBaseDir); - } - return true; -} - -Future fsZipFiles(String zipFilename, List files) async { - try { - // Create an empty archive - final archive = Archive(); - - for (final file in files) { - // Read the file bytes - final bytes = file.readAsBytesSync(); - - // Add the file to the archive - archive.addFile(ArchiveFile( - path.basename(file.path), // File name - bytes.length, // File size - bytes, // File data - )); - } - - // Encode the archive to Zip - final zipData = ZipEncoder().encode(archive); - - // Write the zipped bytes to a file - File(zipFilename) - ..createSync(recursive: true) // Create the file if it doesn't exist - ..writeAsBytesSync(zipData!); - } catch(e) { - log("NodeBase [E] fsZipFiles ... ${e.toString()}"); - } -} - -Future fsUnzipFiles(String zipFilename, String dstDir) async { - try { - final bytes = File(zipFilename).readAsBytesSync(); - // Decode the Zip archive - final archive = ZipDecoder().decodeBytes(bytes); - await fsUnzip(archive, dstDir); - } catch (e) { - log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); - } -} - -Future fsUnzipTarFiles(String tarFilename, String dstDir) async { - try { - final bytes = File(tarFilename).readAsBytesSync(); - // Decode the Zip archive - final archive = TarDecoder().decodeBytes(bytes); - await fsUnzip(archive, dstDir); - } catch (e) { - log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); - } -} - -Future fsUnzipXzTarFiles(String xztarFilename, String dstDir) async { - try { - final bytes = File(xztarFilename).readAsBytesSync(); - // Decode the Zip archive - final archive = TarDecoder().decodeBytes(XZDecoder().decodeBytes(bytes)); - await fsUnzip(archive, dstDir); - } catch (e) { - log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); - } -} - -Future fsUnzipGzTarFiles(String gztarFilename, String dstDir) async { - try { - final bytes = File(gztarFilename).readAsBytesSync(); - // Decode the Zip archive - final archive = TarDecoder().decodeBytes(GZipDecoder().decodeBytes(bytes)); - await fsUnzip(archive, dstDir); - } catch (e) { - log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); - } -} - -Future fsUnzipBzTarFiles(String bztarFilename, String dstDir) async { - try { - final bytes = File(bztarFilename).readAsBytesSync(); - // Decode the Zip archive - final archive = TarDecoder().decodeBytes(BZip2Decoder().decodeBytes(bytes)); - await fsUnzip(archive, dstDir); - } catch (e) { - log("NodeBase [E] fsUnzipFiles ... ${e.toString()}"); - } -} - -Future fsUnzip(Archive archive, String dstDir) async { - for (final file in archive) { - final filename = file.name; - if (file.isFile) { - final data = file.content as List; - File(path.join(dstDir, filename)) - ..createSync(recursive: true) - ..writeAsBytesSync(data); - } else { - Directory(path.join(dstDir, filename)) - .createSync(recursive: true); - } - } -} - -Future fsGuaranteeDir(String filename) async { - final dir = Directory(path.dirname(filename)); - if (!dir.existsSync()) { - await dir.create(recursive: true); - } -} - -Future fsDownload(String filename, String url) async { - var urlobj = Uri.parse(url); - var client = HttpClient(); - try { - final req = await client.getUrl(urlobj); - final res = await req.close(); - res.pipe(File(filename).openWrite()); - } finally { - client.close(); - } -} - -Future fsProgressDownload( - String filename, String url, - StreamController progressToken, - StreamController cancelToken) async { - // ref: filled by GPT 4 turbo and optimized - final httpClient = HttpClient(); - final done = Completer(); - bool canCancel = false; - try { - // Parse the URL - final uri = Uri.parse(url); - // Open a request - final request = await httpClient.getUrl(uri); - // Send the request - final response = await request.close(); - - // Check if the response is OK (status code 200) - if (response.statusCode == 200) { - // Get the total length of the file - final contentLength = response.contentLength; - int downloadedLength = 0; - - // Create a new file (overwrite if exists) - final file = File(filename); - final fileSink = file.openWrite(); - - // Listen for response data - final subscription = response.listen( - (List chunk) { - // Update the downloaded length - downloadedLength += chunk.length; - // Write the chunk to file - fileSink.add(chunk); - - // Calculate and print the download progress - double progressRate = contentLength == 0 ? 1 : (downloadedLength / contentLength); - progressToken.add([downloadedLength, contentLength, progressRate]); - log('NodeBase [D] fsProgressDownload ... progress ${(progressRate * 100).toStringAsFixed(2)}%'); - }, - onDone: () async { - // Close the fileSink to ensure all bytes are written - await fileSink.close(); - progressToken.add([-1, contentLength, 1]); - log('NodeBase [D] fsProgressDownload ... complete $filename'); - done.complete(); - }, - onError: (e) { - progressToken.add([-1, contentLength, -1]); - log('NodeBase [E] fsProgressDownload ... $e'); - done.complete('error'); - }, - cancelOnError: true, - ); - - canCancel = true; - cancelToken.stream.listen((_) { - progressToken.add([-1, contentLength, -1]); - subscription.cancel(); - fileSink.close(); - done.complete('cancel'); - httpClient.close(); - }); - } else { - log('NodeBase [E] fsProgressDownload ... http ${response.statusCode}'); - done.complete('error'); - } - } catch (e) { - log('NodeBase [E] fsProgressDownload ... $e - $url'); - done.complete('error'); - } finally { - await done.future; - httpClient.close(); - await progressToken.close(); - // if no stream listener, it will hang there - if (canCancel) await cancelToken.close(); - } -} - -Future fsCalcHash(String filename) async { - final f = File(filename); - if (!f.existsSync()) return ""; - final digest = await sha256.bind(f.openRead()).first; - return digest.toString(); -} - -Future fsCalcStringHash(String text) async { - final digest = sha256.convert(utf8.encode(text)); - return digest.toString(); -} diff --git a/lib/util/remote.dart b/lib/util/remote.dart deleted file mode 100755 index f5ca3bc..0000000 --- a/lib/util/remote.dart +++ /dev/null @@ -1,40 +0,0 @@ -import 'dart:convert'; -import 'dart:io'; - -Future?> remoteGet(String url) async { - HttpClient client = HttpClient(); - try { - final req = await client.getUrl(Uri.parse(url)); - final response = await req.close(); - if (response.statusCode / 200 == 2) { - final stream = await response.transform(utf8.decoder).toList(); - final ret = jsonDecode(stream.first) as Map; - return ret; - } - throw "request failure"; - } catch (e) { - return null; - } finally { - client.close(); - } -} - -Future?> remotePost(String url, Map data) async { - HttpClient client = HttpClient(); - try { - final req = await client.postUrl(Uri.parse(url)); - req.headers.set("Content-Type", "application/json"); - req.write(data); - final response = await req.close(); - if (response.statusCode / 200 == 2) { - final stream = await response.transform(utf8.decoder).toList(); - final ret = jsonDecode(stream.first) as Map; - return ret; - } - throw "request failure"; - } catch (e) { - return null; - } finally { - client.close(); - } -} \ No newline at end of file diff --git a/linux/.gitignore b/linux/.gitignore deleted file mode 100755 index c7ea17f..0000000 --- a/linux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt deleted file mode 100755 index 40114da..0000000 --- a/linux/CMakeLists.txt +++ /dev/null @@ -1,145 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.10) -project(runner LANGUAGES CXX) - -# The name of the executable created for the application. Change this to change -# the on-disk name of your application. -set(BINARY_NAME "nodebase") -# The unique GTK application identifier for this application. See: -# https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "net.seven.nodebase.nodebase") - -# Explicitly opt in to modern CMake behaviors to avoid warnings with recent -# versions of CMake. -cmake_policy(SET CMP0063 NEW) - -# Load bundled libraries from the lib/ directory relative to the binary. -set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") - -# Root filesystem for cross-building. -if(FLUTTER_TARGET_PLATFORM_SYSROOT) - set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) - set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -endif() - -# Define build configuration options. -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") -endif() - -# Compilation settings that should be applied to most targets. -# -# Be cautious about adding new options here, as plugins use this function by -# default. In most cases, you should add new options to specific targets instead -# of modifying this function. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_14) - target_compile_options(${TARGET} PRIVATE -Wall -Werror) - target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") - target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") -endfunction() - -# Flutter library and tool build rules. -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) - -add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") - -# Define the application target. To change its name, change BINARY_NAME above, -# not the value here, or `flutter run` will no longer work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} - "main.cc" - "my_application.cc" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add dependency libraries. Add any application-specific dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter) -target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) - -# Run the Flutter tool portions of the build. This must not be removed. -add_dependencies(${BINARY_NAME} flutter_assemble) - -# Only the install-generated bundle's copy of the executable will launch -# correctly, since the resources must in the right relative locations. To avoid -# people trying to run the unbundled copy, put it in a subdirectory instead of -# the default top-level location. -set_target_properties(${BINARY_NAME} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" -) - - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# By default, "installing" just makes a relocatable bundle in the build -# directory. -set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -# Start with a clean build bundle directory every time. -install(CODE " - file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") - " COMPONENT Runtime) - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) - install(FILES "${bundled_library}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endforeach(bundled_library) - -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") -install(DIRECTORY "${NATIVE_ASSETS_DIR}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") - install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt deleted file mode 100755 index 27860e8..0000000 --- a/linux/flutter/CMakeLists.txt +++ /dev/null @@ -1,88 +0,0 @@ -# This file controls Flutter-level build steps. It should not be edited. -cmake_minimum_required(VERSION 3.10) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. - -# Serves the same purpose as list(TRANSFORM ... PREPEND ...), -# which isn't available in 3.10. -function(list_prepend LIST_NAME PREFIX) - set(NEW_LIST "") - foreach(element ${${LIST_NAME}}) - list(APPEND NEW_LIST "${PREFIX}${element}") - endforeach(element) - set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) -endfunction() - -# === Flutter Library === -# System-level dependencies. -find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) -pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) -pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) - -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "fl_basic_message_channel.h" - "fl_binary_codec.h" - "fl_binary_messenger.h" - "fl_dart_project.h" - "fl_engine.h" - "fl_json_message_codec.h" - "fl_json_method_codec.h" - "fl_message_codec.h" - "fl_method_call.h" - "fl_method_channel.h" - "fl_method_codec.h" - "fl_method_response.h" - "fl_plugin_registrar.h" - "fl_plugin_registry.h" - "fl_standard_message_codec.h" - "fl_standard_method_codec.h" - "fl_string_codec.h" - "fl_value.h" - "fl_view.h" - "flutter_linux.h" -) -list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") -target_link_libraries(flutter INTERFACE - PkgConfig::GTK - PkgConfig::GLIB - PkgConfig::GIO -) -add_dependencies(flutter flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CMAKE_CURRENT_BINARY_DIR}/_phony_ - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" - ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} -) diff --git a/linux/flutter/flutter_dart.h b/linux/flutter/flutter_dart.h deleted file mode 100755 index 052913b..0000000 --- a/linux/flutter/flutter_dart.h +++ /dev/null @@ -1,463 +0,0 @@ -#ifndef _FLUTTER_DART_ -#define _FLUTTER_DART_ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -static FlEventChannel *eventHandler = nullptr; - -enum NodeAppSTAT { - BORN, READY, RUNNING, DEAD -}; - -class NodeAppMonitor { -public: - NodeAppMonitor(const std::string &name, const std::vector &cmd, const std::map &env) { - this->name = name; - this->cmd = cmd; - this->env = env; - this->stat = NodeAppSTAT::BORN; - this->curpid = -1; - this->pth = std::thread(NodeAppMonitor::Run, this); - } - ~NodeAppMonitor() { - this->Stop(); - if (this->pth.joinable()) this->pth.join(); - } - - void Start() { - this->stat = NodeAppSTAT::READY; - int argN = this->cmd.size(), envN = this->env.size(); - int status = 0; - const char *cmd = this->cmd.at(0).c_str(); - const char *args[argN+1], *env[envN+1]; - const char **cur; - - cur = args; - for (auto i = this->cmd.begin(); i != this->cmd.end(); i++) { - *cur = i->c_str(); - ++ cur; - } - *cur = nullptr; - - int envI = 0; - std::string envRaw[envN]; - for (auto i = this->env.begin(); i != this->env.end(); i++) { - envRaw[envI] = std::string(i->first) + "=" + std::string(i->second); - env[envI] = envRaw[envI].c_str(); - ++ envI; - } - env[envI] = nullptr; - - pid_t chpid = this->_startProcess(cmd, args, env); - if (chpid <= 0) { - this->stat = NodeAppSTAT::DEAD; - printf( - "NodeAppMonitor [E] \"%s\" start failure on CreateProcess.", - this->name.c_str() - ); - return; - } - this->curpid = chpid; - this->stat = NodeAppSTAT::RUNNING; - - if (eventHandler) { - g_autoptr(FlValue) message = fl_value_new_list(); - g_autoptr(GError) error = NULL; - fl_value_append(message, fl_value_new_string ("start")); - fl_value_append(message, fl_value_new_string (this->name.c_str())); - fl_event_channel_send(eventHandler, message, NULL, &error); - } - - waitpid(chpid, &status, 0); - this->curpid = -1; - this->stat = NodeAppSTAT::DEAD; - - if (eventHandler) { - g_autoptr(FlValue) message = fl_value_new_list(); - g_autoptr(GError) error = NULL; - fl_value_append(message, fl_value_new_string ("stop")); - fl_value_append(message, fl_value_new_string (this->name.c_str())); - fl_event_channel_send(eventHandler, message, NULL, &error); - } - } - - void Stop() { - if (!this->IsRunning()) return; - if (this->curpid <= 0) return; - int status = 0; - this->_stopProcessTree(this->curpid, SIGTERM); - waitpid(this->curpid, &status, 0); - } - - NodeAppMonitor* Restart() { - this->Stop(); - return new NodeAppMonitor(this->name, this->cmd, this->env); - } - void toJSON(FlValue* map) { - std::string rstat = "none"; - switch (this->stat) { - case NodeAppSTAT::RUNNING: - rstat = "running"; - break; - case NodeAppSTAT::DEAD: - rstat = "dead"; - break; - case NodeAppSTAT::READY: - rstat = "new"; - break; - case NodeAppSTAT::BORN: - default: - break; - } - g_autoptr(FlValue) statval = fl_value_new_string(rstat.c_str()); - fl_value_set_string(map, "stat", statval); - } - - bool IsRunning() { return this->stat == NodeAppSTAT::RUNNING; } - bool IsDead() { return this->stat == NodeAppSTAT::DEAD; } - - std::string GetName() { return this->name; } - std::vector GetCmd() { return this->cmd; } - std::map GetEnv() { return this->env; } -private: - static void Run(NodeAppMonitor* app) { - app->Start(); - } - - pid_t _startProcess(const char *cmd, const char **args, const char **env) { - pid_t pid = fork(); - if (pid == 0) { - execve(cmd, (char * const *)args, (char * const *)env); - exit(-1); - } else if (pid > 0){ - return pid; - } else { - return -1; - } - } - - bool _stopProcessTree(pid_t pid, int signal) { - DIR *dir; - struct dirent *entry; - char path[PATH_MAX]; - FILE *fp; - pid_t child_pid; - - // Open the /proc directory - dir = opendir("/proc"); - if (!dir) return false; - - // Iterate over each entry in /proc - while ((entry = readdir(dir)) != NULL) { - // Check if the entry is a directory and starts with a digit (representing a PID) - if (entry->d_type == DT_DIR && entry->d_name[0] >= '0' && entry->d_name[0] <= '9') { - sprintf(path, "/proc/%s/stat", entry->d_name); - fp = fopen(path, "r"); - if (fp) { - // Read the process information from the stat file - if (fscanf(fp, "%*d %*s %*c %d", &child_pid) == 1) { - // Check if the process is a child of the target process - if (child_pid == pid) { - // Kill the child process and its subprocesses recursively - this->_stopProcessTree(atoi(entry->d_name), signal); - } - } - fclose(fp); - } - } - } - - closedir(dir); - - // Kill the target process - kill(pid, signal); - return true; - } - -private: - NodeAppSTAT stat; - std::string name; - std::vector cmd; - std::map env; - std::thread pth; - pid_t curpid; -}; - -static std::map services; -static std::mutex service_lock; - -void appStart(const std::string &name, const std::vector &cmd, const std::map &env) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - NodeAppMonitor *app; - if (app_ != services.end()) { - app = app_->second; - services.erase(name); - delete app; - } - app = new NodeAppMonitor(name, cmd, env); - // TODO: if (!app) {} // memory allocate failure - services.insert({name, app}); -} -void appStop(const std::string &name) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - if (app_ == services.end()) return; - NodeAppMonitor *app = app_->second; - app->Stop(); -} -bool appRestart(const std::string &name) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - if (app_ == services.end()) return false; - NodeAppMonitor *app = app_->second; - app->Stop(); - NodeAppMonitor *newapp = app->Restart(); - if (newapp == nullptr) { - return false; - } - delete app; - services.insert({name, newapp}); - return true; -} -void appStat(const std::string &name, FlValue *map) { - auto app_ = services.find(name); - if (app_ == services.end()) return; - NodeAppMonitor *app = app_->second; - app->toJSON(map); -} - -void utilBrowserOpen(const std::string &url) { - if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; - pid_t pid = fork(); - if (pid == -1) { - fprintf(stderr, "cannot open url (fork failed)\n"); - return; - } else if (pid == 0) { - execlp("xdg-open", "xdg-open", url.c_str(), (char*)nullptr); - fprintf(stderr, "cannot open url (execlp failed)\n"); - exit(-1); - } -} - -bool utilFileMarkExecutable(const std::string &filename) { - struct stat fileStat; - if (stat(filename.c_str(), &fileStat)) {printf("%o\n", fileStat.st_mode);return false;} - mode_t newPerms = fileStat.st_mode | S_IXUSR; - if (chmod(filename.c_str(), newPerms)) return false; - return true; -} - -std::string utilGetArch() { - std::string arch("linux-"); - struct utsname uts; - if (uname(&uts) < 0) { - arch += "unknown"; - } else if (strcmp("x86_64", uts.machine) == 0 || strcmp("ia64", uts.machine) == 0) { - arch += "x64"; - } else if (strcmp("x86", uts.machine) == 0 || strcmp("i386", uts.machine) == 0 || strcmp("i686", uts.machine) == 0) { - arch += "x86"; - } else if (strcmp("aarch64", uts.machine) == 0 || strcmp("arm64", uts.machine) == 0 || strcmp("armv8l", uts.machine) == 0) { - arch += "arm64"; - } else if (strcmp("arm", uts.machine) == 0 || strcmp("armv7l", uts.machine) == 0) { - arch += "arm"; - } else { - arch += "unknown"; - } - return arch; -} - -std::string utilWorkspaceBaseDir() { - char buf[PATH_MAX]; - size_t len = readlink("/proc/self/exe", buf, sizeof(buf)); - if (len <= 0) { - buf[0] = '\0'; - } else { - dirname(buf); - } - return std::string(buf); -} - -bool _convertIpBinary2String(struct sockaddr *addr, char* buf, size_t buf_len) { - void *binAddr; - if (addr->sa_family == AF_INET) { - binAddr = &((struct sockaddr_in *)addr)->sin_addr; - } else if (addr->sa_family == AF_INET6) { - binAddr = &((struct sockaddr_in6 *)addr)->sin6_addr; - } else { - return false; - } - if (!inet_ntop(addr->sa_family, binAddr, buf, buf_len)) return false; - return true; -} -bool utilGetIps(std::map> &map) { - struct ifaddrs *ifaddr, *cur; - const char *ifa_name; - char addrBuf[INET6_ADDRSTRLEN]; - if (getifaddrs(&ifaddr)) return false; - for (cur = ifaddr; cur != NULL; cur = cur->ifa_next) { - if (!cur->ifa_addr) continue; - ifa_name = cur->ifa_name; - if (!_convertIpBinary2String(cur->ifa_addr, addrBuf, INET6_ADDRSTRLEN)) continue; - std::string name = std::string(ifa_name); - std::string ipval = std::string(addrBuf); - auto list_ = map.find(name); - if (list_ == map.end()) { - std::vector newlist; - newlist.push_back(ipval); - map.insert({name, newlist}); - } else { - list_->second.push_back(ipval); - } - } - return true; -} - -#define RETURN_BADARG_ERR(x) { fl_method_call_respond_error(method_call, "BAD_ARGS", "Invalid argument type for '" #x "'", nullptr, nullptr); return; } -void InitMethodChannel(FlView* flutter_instance) { - const static char *channel_name = "net.seven.nodebase/app"; - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - - auto channel = fl_method_channel_new( - fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), - channel_name, - FL_METHOD_CODEC(codec) - ); - fl_method_channel_set_method_call_handler( - channel, - [](FlMethodChannel *channel, FlMethodCall *method_call, gpointer user_data) { - g_autoptr(FlMethodResponse) response = nullptr; - const gchar *method_name = fl_method_call_get_name(method_call); - if (strcmp("app.stat", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stat); - FlValue *name_ = fl_value_lookup_string(args, "name"); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stat); - std::string name = std::string(fl_value_get_string(name_)); - g_autoptr(FlValue) appstat = fl_value_new_map(); - appStat(name, appstat); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(appstat)); - } else if (strcmp("app.start", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 3) RETURN_BADARG_ERR(app.start); - FlValue *name_ = fl_value_lookup_string(args, "name"); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - FlValue *cmd_ = fl_value_lookup_string(args, "cmd"); - if (fl_value_get_type(cmd_) != FL_VALUE_TYPE_LIST) RETURN_BADARG_ERR(app.start); - FlValue *env_ = fl_value_lookup_string(args, "env"); - if (fl_value_get_type(env_) != FL_VALUE_TYPE_MAP) env_ = nullptr; - std::string name = std::string(fl_value_get_string(name_)); - - std::vector cmd; - for (size_t i = 0; i < fl_value_get_length(cmd_); i++) { - FlValue *cmdi = fl_value_get_list_value(cmd_, i); - if (fl_value_get_type(cmdi) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - cmd.push_back(std::string(fl_value_get_string(cmdi))); - } - - std::map env; - for (size_t i = 0; env_ && i < fl_value_get_length(env_); i++) { - FlValue *envk_ = fl_value_get_map_key(env_, i); - if (fl_value_get_type(envk_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - FlValue *envv_ = fl_value_get_map_value(env_, i); - if (fl_value_get_type(envv_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.start); - std::string envk = std::string(fl_value_get_string(envk_)); - std::string envv = std::string(fl_value_get_string(envv_)); - env.insert({envk, envv}); - } - - appStart(name, cmd, env); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); - } else if (strcmp("app.restart", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.restart); - FlValue *name_ = fl_value_lookup_string(args, "name"); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.restart); - std::string name = std::string(fl_value_get_string(name_)); - appRestart(name); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); - } else if (strcmp("app.stop", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(app.stop); - FlValue *name_ = fl_value_lookup_string(args, "name"); - if (fl_value_get_type(name_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(app.stop); - std::string name = std::string(fl_value_get_string(name_)); - appStop(name); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); - } else if (strcmp("util.ip", method_name) == 0) { - std::map> iptblmap; - utilGetIps(iptblmap); - g_autoptr(FlValue) iptbl = fl_value_new_map(); - for (auto i = iptblmap.begin(); i != iptblmap.end(); i++) { - g_autoptr(FlValue) list = fl_value_new_list(); - for (auto j = i->second.begin(); j != i->second.end(); j++) { - g_autoptr(FlValue) ip = fl_value_new_string(j->c_str()); - fl_value_append(list, ip); - } - fl_value_set_string(iptbl, i->first.c_str(), list); - } - response = FL_METHOD_RESPONSE(fl_method_success_response_new(iptbl)); - } else if (strcmp("util.file.executable", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.file.executable); - FlValue *filename_ = fl_value_lookup_string(args, "filename"); - if (fl_value_get_type(filename_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.file.executable); - std::string filename = std::string(fl_value_get_string(filename_)); - g_autoptr(FlValue) val = fl_value_new_bool(utilFileMarkExecutable(filename)); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); - } else if (strcmp("util.browser.open", method_name) == 0) { - FlValue *args = fl_method_call_get_args(method_call); - if (fl_value_get_type(args) != FL_VALUE_TYPE_MAP || fl_value_get_length(args) < 1) RETURN_BADARG_ERR(util.browser.open); - FlValue *url_ = fl_value_lookup_string(args, "url"); - if (fl_value_get_type(url_) != FL_VALUE_TYPE_STRING) RETURN_BADARG_ERR(util.browser.open); - std::string url = std::string(fl_value_get_string(url_)); - utilBrowserOpen(url); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(nullptr)); - } else if (strcmp("util.arch", method_name) == 0) { - g_autoptr(FlValue) val = fl_value_new_string(utilGetArch().c_str()); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); - } else if (strcmp("util.workspace", method_name) == 0) { - g_autoptr(FlValue) val = fl_value_new_string(utilWorkspaceBaseDir().c_str()); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(val)); - } else { - response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); - } - fl_method_call_respond(method_call, response, nullptr); - }, - g_strdup("custom_channel"), g_free - ); -} -#undef RETURN_BADARG_ERR - -void InitEventChannel(FlView* flutter_instance) { - const static char *channel_name = "net.seven.nodebase/event"; - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - eventHandler = fl_event_channel_new( - fl_engine_get_binary_messenger(fl_view_get_engine(flutter_instance)), - channel_name, - FL_METHOD_CODEC(codec) - ); -} -#endif // _FLUTTER_DART_ diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc deleted file mode 100755 index e71a16d..0000000 --- a/linux/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,11 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - - -void fl_register_plugins(FlPluginRegistry* registry) { -} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h deleted file mode 100755 index e0f0a47..0000000 --- a/linux/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#ifndef GENERATED_PLUGIN_REGISTRANT_ -#define GENERATED_PLUGIN_REGISTRANT_ - -#include - -// Registers Flutter plugins. -void fl_register_plugins(FlPluginRegistry* registry); - -#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake deleted file mode 100755 index 2e1de87..0000000 --- a/linux/flutter/generated_plugins.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST -) - -list(APPEND FLUTTER_FFI_PLUGIN_LIST -) - -set(PLUGIN_BUNDLED_LIBRARIES) - -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/linux/main.cc b/linux/main.cc deleted file mode 100755 index 4340ffc..0000000 --- a/linux/main.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "my_application.h" - -int main(int argc, char** argv) { - g_autoptr(MyApplication) app = my_application_new(); - return g_application_run(G_APPLICATION(app), argc, argv); -} diff --git a/linux/my_application.cc b/linux/my_application.cc deleted file mode 100755 index 0b3d394..0000000 --- a/linux/my_application.cc +++ /dev/null @@ -1,108 +0,0 @@ -#include "my_application.h" - -#include -#ifdef GDK_WINDOWING_X11 -#include -#endif - -#include "flutter/generated_plugin_registrant.h" -#include "flutter/flutter_dart.h" - -struct _MyApplication { - GtkApplication parent_instance; - char** dart_entrypoint_arguments; -}; - -G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) - -// Implements GApplication::activate. -static void my_application_activate(GApplication* application) { - MyApplication* self = MY_APPLICATION(application); - GtkWindow* window = - GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); - - // Use a header bar when running in GNOME as this is the common style used - // by applications and is the setup most users will be using (e.g. Ubuntu - // desktop). - // If running on X and not using GNOME then just use a traditional title bar - // in case the window manager does more exotic layout, e.g. tiling. - // If running on Wayland assume the header bar will work (may need changing - // if future cases occur). - gboolean use_header_bar = TRUE; -#ifdef GDK_WINDOWING_X11 - GdkScreen* screen = gtk_window_get_screen(window); - if (GDK_IS_X11_SCREEN(screen)) { - const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); - if (g_strcmp0(wm_name, "GNOME Shell") != 0) { - use_header_bar = FALSE; - } - } -#endif - if (use_header_bar) { - GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); - gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "nodebase"); - gtk_header_bar_set_show_close_button(header_bar, TRUE); - gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); - } else { - gtk_window_set_title(window, "nodebase"); - } - - gtk_window_set_default_size(window, 360, 720); - gtk_window_set_resizable(window, FALSE); - gtk_widget_show(GTK_WIDGET(window)); - - g_autoptr(FlDartProject) project = fl_dart_project_new(); - fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); - - FlView* view = fl_view_new(project); - gtk_widget_show(GTK_WIDGET(view)); - gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); - - fl_register_plugins(FL_PLUGIN_REGISTRY(view)); - InitMethodChannel(view); - InitEventChannel(view); - - gtk_widget_grab_focus(GTK_WIDGET(view)); -} - -// Implements GApplication::local_command_line. -static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { - MyApplication* self = MY_APPLICATION(application); - // Strip out the first argument as it is the binary name. - self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); - - g_autoptr(GError) error = nullptr; - if (!g_application_register(application, nullptr, &error)) { - g_warning("Failed to register: %s", error->message); - *exit_status = 1; - return TRUE; - } - - g_application_activate(application); - *exit_status = 0; - - return TRUE; -} - -// Implements GObject::dispose. -static void my_application_dispose(GObject* object) { - MyApplication* self = MY_APPLICATION(object); - g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); - G_OBJECT_CLASS(my_application_parent_class)->dispose(object); -} - -static void my_application_class_init(MyApplicationClass* klass) { - G_APPLICATION_CLASS(klass)->activate = my_application_activate; - G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; - G_OBJECT_CLASS(klass)->dispose = my_application_dispose; -} - -static void my_application_init(MyApplication* self) {} - -MyApplication* my_application_new() { - return MY_APPLICATION(g_object_new(my_application_get_type(), - "application-id", APPLICATION_ID, - "flags", G_APPLICATION_NON_UNIQUE, - nullptr)); -} diff --git a/linux/my_application.h b/linux/my_application.h deleted file mode 100755 index 8f20fb5..0000000 --- a/linux/my_application.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef FLUTTER_MY_APPLICATION_H_ -#define FLUTTER_MY_APPLICATION_H_ - -#include - -G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, - GtkApplication) - -/** - * my_application_new: - * - * Creates a new Flutter-based application. - * - * Returns: a new #MyApplication. - */ -MyApplication* my_application_new(); - -#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/macos/.gitignore b/macos/.gitignore deleted file mode 100755 index d4e0569..0000000 --- a/macos/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# Flutter-related -**/Flutter/ephemeral/ -**/Pods/ - -# Xcode-related -**/dgph -**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig deleted file mode 100755 index f022c34..0000000 --- a/macos/Flutter/Flutter-Debug.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig deleted file mode 100755 index f022c34..0000000 --- a/macos/Flutter/Flutter-Release.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100755 index cccf817..0000000 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,10 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { -} diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj deleted file mode 100755 index 6118882..0000000 --- a/macos/Runner.xcodeproj/project.pbxproj +++ /dev/null @@ -1,695 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 54; - objects = { - -/* Begin PBXAggregateTarget section */ - 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; - buildPhases = ( - 33CC111E2044C6BF0003C045 /* ShellScript */, - ); - dependencies = ( - ); - name = "Flutter Assemble"; - productName = FLX; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; - 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; - 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC10EC2044A3C60003C045; - remoteInfo = Runner; - }; - 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 33CC10E52044A3C60003C045 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 33CC111A2044C6BA0003C045; - remoteInfo = FLX; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 33CC110E2044A8840003C045 /* Bundle Framework */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - name = "Bundle Framework"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; - 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* nodebase.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "nodebase.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; - 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; - 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; - 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; - 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; - 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; - 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 331C80D2294CF70F00263BE5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10EA2044A3C60003C045 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 331C80D6294CF71000263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C80D7294CF71000263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; - 33BA886A226E78AF003329D5 /* Configs */ = { - isa = PBXGroup; - children = ( - 33E5194F232828860026EE4D /* AppInfo.xcconfig */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, - ); - path = Configs; - sourceTree = ""; - }; - 33CC10E42044A3C60003C045 = { - isa = PBXGroup; - children = ( - 33FAB671232836740065AC1E /* Runner */, - 33CEB47122A05771004F2AC0 /* Flutter */, - 331C80D6294CF71000263BE5 /* RunnerTests */, - 33CC10EE2044A3C60003C045 /* Products */, - D73912EC22F37F3D000D13A0 /* Frameworks */, - ); - sourceTree = ""; - }; - 33CC10EE2044A3C60003C045 /* Products */ = { - isa = PBXGroup; - children = ( - 33CC10ED2044A3C60003C045 /* nodebase.app */, - 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 33CC11242044D66E0003C045 /* Resources */ = { - isa = PBXGroup; - children = ( - 33CC10F22044A3C60003C045 /* Assets.xcassets */, - 33CC10F42044A3C60003C045 /* MainMenu.xib */, - 33CC10F72044A3C60003C045 /* Info.plist */, - ); - name = Resources; - path = ..; - sourceTree = ""; - }; - 33CEB47122A05771004F2AC0 /* Flutter */ = { - isa = PBXGroup; - children = ( - 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, - 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, - 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, - 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, - ); - path = Flutter; - sourceTree = ""; - }; - 33FAB671232836740065AC1E /* Runner */ = { - isa = PBXGroup; - children = ( - 33CC10F02044A3C60003C045 /* AppDelegate.swift */, - 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, - 33E51913231747F40026EE4D /* DebugProfile.entitlements */, - 33E51914231749380026EE4D /* Release.entitlements */, - 33CC11242044D66E0003C045 /* Resources */, - 33BA886A226E78AF003329D5 /* Configs */, - ); - path = Runner; - sourceTree = ""; - }; - D73912EC22F37F3D000D13A0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 331C80D4294CF70F00263BE5 /* RunnerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; - buildPhases = ( - 331C80D1294CF70F00263BE5 /* Sources */, - 331C80D2294CF70F00263BE5 /* Frameworks */, - 331C80D3294CF70F00263BE5 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 331C80DA294CF71000263BE5 /* PBXTargetDependency */, - ); - name = RunnerTests; - productName = RunnerTests; - productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 33CC10EC2044A3C60003C045 /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 33CC10E92044A3C60003C045 /* Sources */, - 33CC10EA2044A3C60003C045 /* Frameworks */, - 33CC10EB2044A3C60003C045 /* Resources */, - 33CC110E2044A8840003C045 /* Bundle Framework */, - 3399D490228B24CF009A79C7 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - 33CC11202044C79F0003C045 /* PBXTargetDependency */, - ); - name = Runner; - productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* nodebase.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 33CC10E52044A3C60003C045 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1430; - ORGANIZATIONNAME = ""; - TargetAttributes = { - 331C80D4294CF70F00263BE5 = { - CreatedOnToolsVersion = 14.0; - TestTargetID = 33CC10EC2044A3C60003C045; - }; - 33CC10EC2044A3C60003C045 = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; - SystemCapabilities = { - com.apple.Sandbox = { - enabled = 1; - }; - }; - }; - 33CC111A2044C6BA0003C045 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Manual; - }; - }; - }; - buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 33CC10E42044A3C60003C045; - productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 33CC10EC2044A3C60003C045 /* Runner */, - 331C80D4294CF70F00263BE5 /* RunnerTests */, - 33CC111A2044C6BA0003C045 /* Flutter Assemble */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 331C80D3294CF70F00263BE5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10EB2044A3C60003C045 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, - 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3399D490228B24CF009A79C7 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; - }; - 33CC111E2044C6BF0003C045 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - Flutter/ephemeral/FlutterInputs.xcfilelist, - ); - inputPaths = ( - Flutter/ephemeral/tripwire, - ); - outputFileListPaths = ( - Flutter/ephemeral/FlutterOutputs.xcfilelist, - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 331C80D1294CF70F00263BE5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 33CC10E92044A3C60003C045 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, - 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, - 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC10EC2044A3C60003C045 /* Runner */; - targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; - }; - 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; - targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 33CC10F52044A3C60003C045 /* Base */, - ); - name = MainMenu.xib; - path = Runner; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 331C80DB294CF71000263BE5 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nodebase.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/nodebase"; - }; - name = Debug; - }; - 331C80DC294CF71000263BE5 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nodebase.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/nodebase"; - }; - name = Release; - }; - 331C80DD294CF71000263BE5 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase.RunnerTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/nodebase.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/nodebase"; - }; - name = Profile; - }; - 338D0CE9231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - }; - name = Profile; - }; - 338D0CEA231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Profile; - }; - 338D0CEB231458BD00FA5F75 /* Profile */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Profile; - }; - 33CC10F92044A3C60003C045 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 33CC10FA2044A3C60003C045 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - }; - name = Release; - }; - 33CC10FC2044A3C60003C045 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 33CC10FD2044A3C60003C045 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; - 33CC111C2044C6BA0003C045 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Manual; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 33CC111D2044C6BA0003C045 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 331C80DB294CF71000263BE5 /* Debug */, - 331C80DC294CF71000263BE5 /* Release */, - 331C80DD294CF71000263BE5 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC10F92044A3C60003C045 /* Debug */, - 33CC10FA2044A3C60003C045 /* Release */, - 338D0CE9231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC10FC2044A3C60003C045 /* Debug */, - 33CC10FD2044A3C60003C045 /* Release */, - 338D0CEA231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 33CC111C2044C6BA0003C045 /* Debug */, - 33CC111D2044C6BA0003C045 /* Release */, - 338D0CEB231458BD00FA5F75 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 33CC10E52044A3C60003C045 /* Project object */; -} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100755 index fc6bf80..0000000 --- a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme deleted file mode 100755 index 3dd3ce4..0000000 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100755 index 59c6d39..0000000 --- a/macos/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100755 index fc6bf80..0000000 --- a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift deleted file mode 100755 index 553a135..0000000 --- a/macos/Runner/AppDelegate.swift +++ /dev/null @@ -1,9 +0,0 @@ -import Cocoa -import FlutterMacOS - -@NSApplicationMain -class AppDelegate: FlutterAppDelegate { - override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { - return true - } -} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100755 index 8d4e7cb..0000000 --- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" - }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_64.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_1024.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png deleted file mode 100755 index 82b6f9d9a33e198f5747104729e1fcef999772a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png deleted file mode 100755 index 13b35eba55c6dabc3aac36f33d859266c18fa0d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5680 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 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png deleted file mode 100755 index 0a3f5fa40fb3d1e0710331a48de5d256da3f275d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 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 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png deleted file mode 100755 index 2f1632cfddf3d9dade342351e627a0a75609fb46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig deleted file mode 100755 index e3e5ade..0000000 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ /dev/null @@ -1,14 +0,0 @@ -// Application-level settings for the Runner target. -// -// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the -// future. If not, the values below would default to using the project name when this becomes a -// 'flutter create' template. - -// The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = nodebase - -// The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = net.seven.nodebase.nodebase - -// The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2024 net.seven.nodebase. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig deleted file mode 100755 index b398823..0000000 --- a/macos/Runner/Configs/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Debug.xcconfig" -#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig deleted file mode 100755 index d93e5dc..0000000 --- a/macos/Runner/Configs/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../../Flutter/Flutter-Release.xcconfig" -#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig deleted file mode 100755 index fb4d7d3..0000000 --- a/macos/Runner/Configs/Warnings.xcconfig +++ /dev/null @@ -1,13 +0,0 @@ -WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings -GCC_WARN_UNDECLARED_SELECTOR = YES -CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES -CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE -CLANG_WARN__DUPLICATE_METHOD_MATCH = YES -CLANG_WARN_PRAGMA_PACK = YES -CLANG_WARN_STRICT_PROTOTYPES = YES -CLANG_WARN_COMMA = YES -GCC_WARN_STRICT_SELECTOR_MATCH = YES -CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES -CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES -GCC_WARN_SHADOW = YES -CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements deleted file mode 100755 index 51d0967..0000000 --- a/macos/Runner/DebugProfile.entitlements +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.cs.allow-jit - - com.apple.security.network.server - - - diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist deleted file mode 100755 index 3733c1a..0000000 --- a/macos/Runner/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - $(PRODUCT_COPYRIGHT) - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift deleted file mode 100755 index ab30cba..0000000 --- a/macos/Runner/MainFlutterWindow.swift +++ /dev/null @@ -1,15 +0,0 @@ -import Cocoa -import FlutterMacOS - -class MainFlutterWindow: NSWindow { - override func awakeFromNib() { - let flutterViewController = FlutterViewController() - let windowFrame = self.frame - self.contentViewController = flutterViewController - self.setFrame(windowFrame, display: true) - - RegisterGeneratedPlugins(registry: flutterViewController) - - super.awakeFromNib() - } -} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements deleted file mode 100755 index 04336df..0000000 --- a/macos/Runner/Release.entitlements +++ /dev/null @@ -1,8 +0,0 @@ - - - - - com.apple.security.app-sandbox - - - diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift deleted file mode 100755 index ba12981..0000000 --- a/macos/RunnerTests/RunnerTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import FlutterMacOS -import Cocoa -import XCTest - -class RunnerTests: XCTestCase { - - func testExample() { - // If you add code to the Runner application, consider adding tests here. - // See https://developer.apple.com/documentation/xctest for more information about using XCTest. - } - -} diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100755 index 9b644bd..0000000 --- a/pubspec.lock +++ /dev/null @@ -1,273 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - archive: - dependency: "direct main" - description: - name: archive - sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.4.10" - async: - dependency: transitive - description: - name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.0" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.18.0" - convert: - dependency: transitive - description: - name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.1.1" - crypto: - dependency: "direct main" - description: - name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.0.6" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.1" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - intl: - dependency: "direct main" - description: - name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.18.1" - js: - dependency: transitive - description: - name: js - sha256: "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b" - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.7.0" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" - url: "https://pub.flutter-io.cn" - source: hosted - version: "10.0.0" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" - lints: - dependency: transitive - description: - name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.0.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.12.16+1" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.8.0" - meta: - dependency: transitive - description: - name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.11.0" - path: - dependency: "direct main" - description: - name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.9.0" - pointycastle: - dependency: transitive - description: - name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" - url: "https://pub.flutter-io.cn" - source: hosted - version: "3.7.4" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.10.0" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.11.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.2" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.6.1" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.2" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.4" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 - url: "https://pub.flutter-io.cn" - source: hosted - version: "13.0.0" -sdks: - dart: ">=3.2.4 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml deleted file mode 100755 index fd9b726..0000000 --- a/pubspec.yaml +++ /dev/null @@ -1,98 +0,0 @@ -name: nodebase -description: "Running Node.js application over Wifi and share with your friends." -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 - -environment: - sdk: '>=3.2.4 <4.0.0' - -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. -dependencies: - flutter: - sdk: flutter - - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 - path: ^1.8.3 - archive: ^3.4.10 - flutter_localizations: - sdk: flutter - intl: any - crypto: ^3.0.3 - -dev_dependencies: - flutter_test: - sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - flutter_lints: ^3.0.1 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. -flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. - uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - assets: - - asset/image/logo.png - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/test/util_fs_test.dart b/test/util_fs_test.dart deleted file mode 100755 index 0575923..0000000 --- a/test/util_fs_test.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'dart:io'; - -import 'package:flutter_test/flutter_test.dart'; -import 'package:path/path.dart' as path; -import 'package:nodebase/util/fs.dart'; - -void main() { - test('hash functions (file, string) should work correctly', () async { - final baseDir = path.dirname(Platform.script.toFilePath()); - final testfile = path.join(baseDir, 'asset', 'image', 'logo.png'); - expect(await fsCalcHash(testfile), "9c3cfce62af42b32b3ad94e40594869065fcf936dff200a7cc042198d218fcec"); - expect(await fsCalcStringHash("logo.png"), "ab211233b6576dbb0f8b5826447eeac61e2a833a99ac5d788fbc1a174c3c6ce5"); - }); -} diff --git a/test/widget_test.dart b/test/widget_test.dart deleted file mode 100755 index d6c7473..0000000 --- a/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:nodebase/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/web/favicon.png b/web/favicon.png deleted file mode 100755 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png deleted file mode 100755 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 zcmZ`-2T+sGz6~)*FVZ`aW+(v>MIm&M-g^@e2u-B-DoB?qO+b1Tq<5uCCv>ESfRum& zp%X;f!~1{tzL__3=gjVJ=j=J>+nMj%ncXj1Q(b|Ckbw{Y0FWpt%4y%$uD=Z*c-x~o zE;IoE;xa#7Ll5nj-e4CuXB&G*IM~D21rCP$*xLXAK8rIMCSHuSu%bL&S3)8YI~vyp@KBu9Ph7R_pvKQ@xv>NQ`dZp(u{Z8K3yOB zn7-AR+d2JkW)KiGx0hosml;+eCXp6+w%@STjFY*CJ?udJ64&{BCbuebcuH;}(($@@ znNlgBA@ZXB)mcl9nbX#F!f_5Z=W>0kh|UVWnf!At4V*LQP%*gPdCXd6P@J4Td;!Ur z<2ZLmwr(NG`u#gDEMP19UcSzRTL@HsK+PnIXbVBT@oHm53DZr?~V(0{rsalAfwgo zEh=GviaqkF;}F_5-yA!1u3!gxaR&Mj)hLuj5Q-N-@Lra{%<4ONja8pycD90&>yMB` zchhd>0CsH`^|&TstH-8+R`CfoWqmTTF_0?zDOY`E`b)cVi!$4xA@oO;SyOjJyP^_j zx^@Gdf+w|FW@DMdOi8=4+LJl$#@R&&=UM`)G!y%6ZzQLoSL%*KE8IO0~&5XYR9 z&N)?goEiWA(YoRfT{06&D6Yuu@Qt&XVbuW@COb;>SP9~aRc+z`m`80pB2o%`#{xD@ zI3RAlukL5L>px6b?QW1Ac_0>ew%NM!XB2(H+1Y3AJC?C?O`GGs`331Nd4ZvG~bMo{lh~GeL zSL|tT*fF-HXxXYtfu5z+T5Mx9OdP7J4g%@oeC2FaWO1D{=NvL|DNZ}GO?O3`+H*SI z=grGv=7dL{+oY0eJFGO!Qe(e2F?CHW(i!!XkGo2tUvsQ)I9ev`H&=;`N%Z{L zO?vV%rDv$y(@1Yj@xfr7Kzr<~0{^T8wM80xf7IGQF_S-2c0)0D6b0~yD7BsCy+(zL z#N~%&e4iAwi4F$&dI7x6cE|B{f@lY5epaDh=2-(4N05VO~A zQT3hanGy_&p+7Fb^I#ewGsjyCEUmSCaP6JDB*=_()FgQ(-pZ28-{qx~2foO4%pM9e z*_63RT8XjgiaWY|*xydf;8MKLd{HnfZ2kM%iq}fstImB-K6A79B~YoPVa@tYN@T_$ zea+9)<%?=Fl!kd(Y!G(-o}ko28hg2!MR-o5BEa_72uj7Mrc&{lRh3u2%Y=Xk9^-qa zBPWaD=2qcuJ&@Tf6ue&)4_V*45=zWk@Z}Q?f5)*z)-+E|-yC4fs5CE6L_PH3=zI8p z*Z3!it{1e5_^(sF*v=0{`U9C741&lub89gdhKp|Y8CeC{_{wYK-LSbp{h)b~9^j!s z7e?Y{Z3pZv0J)(VL=g>l;<}xk=T*O5YR|hg0eg4u98f2IrA-MY+StQIuK-(*J6TRR z|IM(%uI~?`wsfyO6Tgmsy1b3a)j6M&-jgUjVg+mP*oTKdHg?5E`!r`7AE_#?Fc)&a z08KCq>Gc=ne{PCbRvs6gVW|tKdcE1#7C4e`M|j$C5EYZ~Y=jUtc zj`+?p4ba3uy7><7wIokM79jPza``{Lx0)zGWg;FW1^NKY+GpEi=rHJ+fVRGfXO zPHV52k?jxei_!YYAw1HIz}y8ZMwdZqU%ESwMn7~t zdI5%B;U7RF=jzRz^NuY9nM)&<%M>x>0(e$GpU9th%rHiZsIT>_qp%V~ILlyt^V`=d z!1+DX@ah?RnB$X!0xpTA0}lN@9V-ePx>wQ?-xrJr^qDlw?#O(RsXeAvM%}rg0NT#t z!CsT;-vB=B87ShG`GwO;OEbeL;a}LIu=&@9cb~Rsx(ZPNQ!NT7H{@j0e(DiLea>QD zPmpe90gEKHEZ8oQ@6%E7k-Ptn#z)b9NbD@_GTxEhbS+}Bb74WUaRy{w;E|MgDAvHw zL)ycgM7mB?XVh^OzbC?LKFMotw3r@i&VdUV%^Efdib)3@soX%vWCbnOyt@Y4swW925@bt45y0HY3YI~BnnzZYrinFy;L?2D3BAL`UQ zEj))+f>H7~g8*VuWQ83EtGcx`hun$QvuurSMg3l4IP8Fe`#C|N6mbYJ=n;+}EQm;< z!!N=5j1aAr_uEnnzrEV%_E|JpTb#1p1*}5!Ce!R@d$EtMR~%9# zd;h8=QGT)KMW2IKu_fA_>p_und#-;Q)p%%l0XZOXQicfX8M~7?8}@U^ihu;mizj)t zgV7wk%n-UOb z#!P5q?Ex+*Kx@*p`o$q8FWL*E^$&1*!gpv?Za$YO~{BHeGY*5%4HXUKa_A~~^d z=E*gf6&+LFF^`j4$T~dR)%{I)T?>@Ma?D!gi9I^HqvjPc3-v~=qpX1Mne@*rzT&Xw zQ9DXsSV@PqpEJO-g4A&L{F&;K6W60D!_vs?Vx!?w27XbEuJJP&);)^+VF1nHqHBWu z^>kI$M9yfOY8~|hZ9WB!q-9u&mKhEcRjlf2nm_@s;0D#c|@ED7NZE% zzR;>P5B{o4fzlfsn3CkBK&`OSb-YNrqx@N#4CK!>bQ(V(D#9|l!e9(%sz~PYk@8zt zPN9oK78&-IL_F zhsk1$6p;GqFbtB^ZHHP+cjMvA0(LqlskbdYE_rda>gvQLTiqOQ1~*7lg%z*&p`Ry& zRcG^DbbPj_jOKHTr8uk^15Boj6>hA2S-QY(W-6!FIq8h$<>MI>PYYRenQDBamO#Fv zAH5&ImqKBDn0v5kb|8i0wFhUBJTpT!rB-`zK)^SNnRmLraZcPYK7b{I@+}wXVdW-{Ps17qdRA3JatEd?rPV z4@}(DAMf5EqXCr4-B+~H1P#;t@O}B)tIJ(W6$LrK&0plTmnPpb1TKn3?f?Kk``?D+ zQ!MFqOX7JbsXfQrz`-M@hq7xlfNz;_B{^wbpG8des56x(Q)H)5eLeDwCrVR}hzr~= zM{yXR6IM?kXxauLza#@#u?Y|o;904HCqF<8yT~~c-xyRc0-vxofnxG^(x%>bj5r}N zyFT+xnn-?B`ohA>{+ZZQem=*Xpqz{=j8i2TAC#x-m;;mo{{sLB_z(UoAqD=A#*juZ zCv=J~i*O8;F}A^Wf#+zx;~3B{57xtoxC&j^ie^?**T`WT2OPRtC`xj~+3Kprn=rVM zVJ|h5ux%S{dO}!mq93}P+h36mZ5aZg1-?vhL$ke1d52qIiXSE(llCr5i=QUS?LIjc zV$4q=-)aaR4wsrQv}^shL5u%6;`uiSEs<1nG^?$kl$^6DL z43CjY`M*p}ew}}3rXc7Xck@k41jx}c;NgEIhKZ*jsBRZUP-x2cm;F1<5$jefl|ppO zmZd%%?gMJ^g9=RZ^#8Mf5aWNVhjAS^|DQO+q$)oeob_&ZLFL(zur$)); zU19yRm)z<4&4-M}7!9+^Wl}Uk?`S$#V2%pQ*SIH5KI-mn%i;Z7-)m$mN9CnI$G7?# zo`zVrUwoSL&_dJ92YhX5TKqaRkfPgC4=Q&=K+;_aDs&OU0&{WFH}kKX6uNQC6%oUH z2DZa1s3%Vtk|bglbxep-w)PbFG!J17`<$g8lVhqD2w;Z0zGsh-r zxZ13G$G<48leNqR!DCVt9)@}(zMI5w6Wo=N zpP1*3DI;~h2WDWgcKn*f!+ORD)f$DZFwgKBafEZmeXQMAsq9sxP9A)7zOYnkHT9JU zRA`umgmP9d6=PHmFIgx=0$(sjb>+0CHG)K@cPG{IxaJ&Ueo8)0RWgV9+gO7+Bl1(F z7!BslJ2MP*PWJ;x)QXbR$6jEr5q3 z(3}F@YO_P1NyTdEXRLU6fp?9V2-S=E+YaeLL{Y)W%6`k7$(EW8EZSA*(+;e5@jgD^I zaJQ2|oCM1n!A&-8`;#RDcZyk*+RPkn_r8?Ak@agHiSp*qFNX)&i21HE?yuZ;-C<3C zwJGd1lx5UzViP7sZJ&|LqH*mryb}y|%AOw+v)yc`qM)03qyyrqhX?ub`Cjwx2PrR! z)_z>5*!*$x1=Qa-0uE7jy0z`>|Ni#X+uV|%_81F7)b+nf%iz=`fF4g5UfHS_?PHbr zB;0$bK@=di?f`dS(j{l3-tSCfp~zUuva+=EWxJcRfp(<$@vd(GigM&~vaYZ0c#BTs z3ijkxMl=vw5AS&DcXQ%eeKt!uKvh2l3W?&3=dBHU=Gz?O!40S&&~ei2vg**c$o;i89~6DVns zG>9a*`k5)NI9|?W!@9>rzJ;9EJ=YlJTx1r1BA?H`LWijk(rTax9(OAu;q4_wTj-yj z1%W4GW&K4T=uEGb+E!>W0SD_C0RR91 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png deleted file mode 100755 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 zcmd5=2T+s!lYZ%-(h(2@5fr2dC?F^$C=i-}R6$UX8af(!je;W5yC_|HmujSgN*6?W z3knF*TL1$|?oD*=zPbBVex*RUIKsL<(&Rj9%^UD2IK3W?2j>D?eWQgvS-HLymHo9%~|N2Q{~j za?*X-{b9JRowv_*Mh|;*-kPFn>PI;r<#kFaxFqbn?aq|PduQg=2Q;~Qc}#z)_T%x9 zE|0!a70`58wjREmAH38H1)#gof)U3g9FZ^ zF7&-0^Hy{4XHWLoC*hOG(dg~2g6&?-wqcpf{ z&3=o8vw7lMi22jCG9RQbv8H}`+}9^zSk`nlR8?Z&G2dlDy$4#+WOlg;VHqzuE=fM@ z?OI6HEJH4&tA?FVG}9>jAnq_^tlw8NbjNhfqk2rQr?h(F&WiKy03Sn=-;ZJRh~JrD zbt)zLbnabttEZ>zUiu`N*u4sfQaLE8-WDn@tHp50uD(^r-}UsUUu)`!Rl1PozAc!a z?uj|2QDQ%oV-jxUJmJycySBINSKdX{kDYRS=+`HgR2GO19fg&lZKyBFbbXhQV~v~L za^U944F1_GtuFXtvDdDNDvp<`fqy);>Vw=ncy!NB85Tw{&sT5&Ox%-p%8fTS;OzlRBwErvO+ROe?{%q-Zge=%Up|D4L#>4K@Ke=x%?*^_^P*KD zgXueMiS63!sEw@fNLB-i^F|@Oib+S4bcy{eu&e}Xvb^(mA!=U=Xr3||IpV~3K zQWzEsUeX_qBe6fky#M zzOJm5b+l;~>=sdp%i}}0h zO?B?i*W;Ndn02Y0GUUPxERG`3Bjtj!NroLoYtyVdLtl?SE*CYpf4|_${ku2s`*_)k zN=a}V8_2R5QANlxsq!1BkT6$4>9=-Ix4As@FSS;1q^#TXPrBsw>hJ}$jZ{kUHoP+H zvoYiR39gX}2OHIBYCa~6ERRPJ#V}RIIZakUmuIoLF*{sO8rAUEB9|+A#C|@kw5>u0 zBd=F!4I)Be8ycH*)X1-VPiZ+Ts8_GB;YW&ZFFUo|Sw|x~ZajLsp+_3gv((Q#N>?Jz zFBf`~p_#^${zhPIIJY~yo!7$-xi2LK%3&RkFg}Ax)3+dFCjGgKv^1;lUzQlPo^E{K zmCnrwJ)NuSaJEmueEPO@(_6h3f5mFffhkU9r8A8(JC5eOkux{gPmx_$Uv&|hyj)gN zd>JP8l2U&81@1Hc>#*su2xd{)T`Yw< zN$dSLUN}dfx)Fu`NcY}TuZ)SdviT{JHaiYgP4~@`x{&h*Hd>c3K_To9BnQi@;tuoL z%PYQo&{|IsM)_>BrF1oB~+`2_uZQ48z9!)mtUR zdfKE+b*w8cPu;F6RYJiYyV;PRBbThqHBEu_(U{(gGtjM}Zi$pL8Whx}<JwE3RM0F8x7%!!s)UJVq|TVd#hf1zVLya$;mYp(^oZQ2>=ZXU1c$}f zm|7kfk>=4KoQoQ!2&SOW5|JP1)%#55C$M(u4%SP~tHa&M+=;YsW=v(Old9L3(j)`u z2?#fK&1vtS?G6aOt@E`gZ9*qCmyvc>Ma@Q8^I4y~f3gs7*d=ATlP>1S zyF=k&6p2;7dn^8?+!wZO5r~B+;@KXFEn^&C=6ma1J7Au6y29iMIxd7#iW%=iUzq&C=$aPLa^Q zncia$@TIy6UT@69=nbty5epP>*fVW@5qbUcb2~Gg75dNd{COFLdiz3}kODn^U*=@E z0*$7u7Rl2u)=%fk4m8EK1ctR!6%Ve`e!O20L$0LkM#f+)n9h^dn{n`T*^~d+l*Qlx z$;JC0P9+en2Wlxjwq#z^a6pdnD6fJM!GV7_%8%c)kc5LZs_G^qvw)&J#6WSp< zmsd~1-(GrgjC56Pdf6#!dt^y8Rg}!#UXf)W%~PeU+kU`FeSZHk)%sFv++#Dujk-~m zFHvVJC}UBn2jN& zs!@nZ?e(iyZPNo`p1i#~wsv9l@#Z|ag3JR>0#u1iW9M1RK1iF6-RbJ4KYg?B`dET9 zyR~DjZ>%_vWYm*Z9_+^~hJ_|SNTzBKx=U0l9 z9x(J96b{`R)UVQ$I`wTJ@$_}`)_DyUNOso6=WOmQKI1e`oyYy1C&%AQU<0-`(ow)1 zT}gYdwWdm4wW6|K)LcfMe&psE0XGhMy&xS`@vLi|1#Za{D6l@#D!?nW87wcscUZgELT{Cz**^;Zb~7 z(~WFRO`~!WvyZAW-8v!6n&j*PLm9NlN}BuUN}@E^TX*4Or#dMMF?V9KBeLSiLO4?B zcE3WNIa-H{ThrlCoN=XjOGk1dT=xwwrmt<1a)mrRzg{35`@C!T?&_;Q4Ce=5=>z^*zE_c(0*vWo2_#TD<2)pLXV$FlwP}Ik74IdDQU@yhkCr5h zn5aa>B7PWy5NQ!vf7@p_qtC*{dZ8zLS;JetPkHi>IvPjtJ#ThGQD|Lq#@vE2xdl%`x4A8xOln}BiQ92Po zW;0%A?I5CQ_O`@Ad=`2BLPPbBuPUp@Hb%a_OOI}y{Rwa<#h z5^6M}s7VzE)2&I*33pA>e71d78QpF>sNK;?lj^Kl#wU7G++`N_oL4QPd-iPqBhhs| z(uVM}$ItF-onXuuXO}o$t)emBO3Hjfyil@*+GF;9j?`&67GBM;TGkLHi>@)rkS4Nj zAEk;u)`jc4C$qN6WV2dVd#q}2X6nKt&X*}I@jP%Srs%%DS92lpDY^K*Sx4`l;aql$ zt*-V{U&$DM>pdO?%jt$t=vg5|p+Rw?SPaLW zB6nvZ69$ne4Z(s$3=Rf&RX8L9PWMV*S0@R zuIk&ba#s6sxVZ51^4Kon46X^9`?DC9mEhWB3f+o4#2EXFqy0(UTc>GU| zGCJmI|Dn-dX#7|_6(fT)>&YQ0H&&JX3cTvAq(a@ydM4>5Njnuere{J8p;3?1az60* z$1E7Yyxt^ytULeokgDnRVKQw9vzHg1>X@@jM$n$HBlveIrKP5-GJq%iWH#odVwV6cF^kKX(@#%%uQVb>#T6L^mC@)%SMd4DF? zVky!~ge27>cpUP1Vi}Z32lbLV+CQy+T5Wdmva6Fg^lKb!zrg|HPU=5Qu}k;4GVH+x z%;&pN1LOce0w@9i1Mo-Y|7|z}fbch@BPp2{&R-5{GLoeu8@limQmFF zaJRR|^;kW_nw~0V^ zfTnR!Ni*;-%oSHG1yItARs~uxra|O?YJxBzLjpeE-=~TO3Dn`JL5Gz;F~O1u3|FE- zvK2Vve`ylc`a}G`gpHg58Cqc9fMoy1L}7x7T>%~b&irrNMo?np3`q;d3d;zTK>nrK zOjPS{@&74-fA7j)8uT9~*g23uGnxwIVj9HorzUX#s0pcp2?GH6i}~+kv9fWChtPa_ z@T3m+$0pbjdQw7jcnHn;Pi85hk_u2-1^}c)LNvjdam8K-XJ+KgKQ%!?2n_!#{$H|| zLO=%;hRo6EDmnOBKCL9Cg~ETU##@u^W_5joZ%Et%X_n##%JDOcsO=0VL|Lkk!VdRJ z^|~2pB@PUspT?NOeO?=0Vb+fAGc!j%Ufn-cB`s2A~W{Zj{`wqWq_-w0wr@6VrM zbzni@8c>WS!7c&|ZR$cQ;`niRw{4kG#e z70e!uX8VmP23SuJ*)#(&R=;SxGAvq|&>geL&!5Z7@0Z(No*W561n#u$Uc`f9pD70# z=sKOSK|bF~#khTTn)B28h^a1{;>EaRnHj~>i=Fnr3+Fa4 z`^+O5_itS#7kPd20rq66_wH`%?HNzWk@XFK0n;Z@Cx{kx==2L22zWH$Yg?7 zvDj|u{{+NR3JvUH({;b*$b(U5U z7(lF!1bz2%06+|-v(D?2KgwNw7( zJB#Tz+ZRi&U$i?f34m7>uTzO#+E5cbaiQ&L}UxyOQq~afbNB4EI{E04ZWg53w0A{O%qo=lF8d zf~ktGvIgf-a~zQoWf>loF7pOodrd0a2|BzwwPDV}ShauTK8*fmF6NRbO>Iw9zZU}u zw8Ya}?seBnEGQDmH#XpUUkj}N49tP<2jYwTFp!P+&Fd(%Z#yo80|5@zN(D{_pNow*&4%ql zW~&yp@scb-+Qj-EmErY+Tu=dUmf@*BoXY2&oKT8U?8?s1d}4a`Aq>7SV800m$FE~? zjmz(LY+Xx9sDX$;vU`xgw*jLw7dWOnWWCO8o|;}f>cu0Q&`0I{YudMn;P;L3R-uz# zfns_mZED_IakFBPP2r_S8XM$X)@O-xVKi4`7373Jkd5{2$M#%cRhWer3M(vr{S6>h zj{givZJ3(`yFL@``(afn&~iNx@B1|-qfYiZu?-_&Z8+R~v`d6R-}EX9IVXWO-!hL5 z*k6T#^2zAXdardU3Ao~I)4DGdAv2bx{4nOK`20rJo>rmk3S2ZDu}))8Z1m}CKigf0 z3L`3Y`{huj`xj9@`$xTZzZc3je?n^yG<8sw$`Y%}9mUsjUR%T!?k^(q)6FH6Af^b6 zlPg~IEwg0y;`t9y;#D+uz!oE4VP&Je!<#q*F?m5L5?J3i@!0J6q#eu z!RRU`-)HeqGi_UJZ(n~|PSNsv+Wgl{P-TvaUQ9j?ZCtvb^37U$sFpBrkT{7Jpd?HpIvj2!}RIq zH{9~+gErN2+}J`>Jvng2hwM`=PLNkc7pkjblKW|+Fk9rc)G1R>Ww>RC=r-|!m-u7( zc(a$9NG}w#PjWNMS~)o=i~WA&4L(YIW25@AL9+H9!?3Y}sv#MOdY{bb9j>p`{?O(P zIvb`n?_(gP2w3P#&91JX*md+bBEr%xUHMVqfB;(f?OPtMnAZ#rm5q5mh;a2f_si2_ z3oXWB?{NF(JtkAn6F(O{z@b76OIqMC$&oJ_&S|YbFJ*)3qVX_uNf5b8(!vGX19hsG z(OP>RmZp29KH9Ge2kKjKigUmOe^K_!UXP`von)PR8Qz$%=EmOB9xS(ZxE_tnyzo}7 z=6~$~9k0M~v}`w={AeqF?_)9q{m8K#6M{a&(;u;O41j)I$^T?lx5(zlebpY@NT&#N zR+1bB)-1-xj}R8uwqwf=iP1GbxBjneCC%UrSdSxK1vM^i9;bUkS#iRZw2H>rS<2<$ zNT3|sDH>{tXb=zq7XZi*K?#Zsa1h1{h5!Tq_YbKFm_*=A5-<~j63he;4`77!|LBlo zR^~tR3yxcU=gDFbshyF6>o0bdp$qmHS7D}m3;^QZq9kBBU|9$N-~oU?G5;jyFR7>z hN`IR97YZXIo@y!QgFWddJ3|0`sjFx!m))><{BI=FK%f8s diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png deleted file mode 100755 index eb9b4d76e525556d5d89141648c724331630325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png deleted file mode 100755 index d69c56691fbdb0b7efa65097c7cc1edac12a6d3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20998 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 MPgg&ebxsLQ025IeI{*Lx diff --git a/web/index.html b/web/index.html deleted file mode 100755 index 83cde70..0000000 --- a/web/index.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - nodebase - - - - - - - - - - diff --git a/web/manifest.json b/web/manifest.json deleted file mode 100755 index 8f6a3dc..0000000 --- a/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "nodebase", - "short_name": "nodebase", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "Running Node.js application over Wifi and share with your friends.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} diff --git a/windows/.gitignore b/windows/.gitignore deleted file mode 100755 index ec4098a..0000000 --- a/windows/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -flutter/ephemeral/ - -# Visual Studio user-specific files. -*.suo -*.user -*.userosscache -*.sln.docstates - -# Visual Studio build-related files. -x64/ -x86/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt deleted file mode 100755 index 99b14a3..0000000 --- a/windows/CMakeLists.txt +++ /dev/null @@ -1,108 +0,0 @@ -# Project-level configuration. -cmake_minimum_required(VERSION 3.14) -project(nodebase LANGUAGES CXX) - -# The name of the executable created for the application. Change this to change -# the on-disk name of your application. -set(BINARY_NAME "nodebase") - -# Explicitly opt in to modern CMake behaviors to avoid warnings with recent -# versions of CMake. -cmake_policy(VERSION 3.14...3.25) - -# Define build configuration option. -get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if(IS_MULTICONFIG) - set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" - CACHE STRING "" FORCE) -else() - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE "Debug" CACHE - STRING "Flutter build mode" FORCE) - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS - "Debug" "Profile" "Release") - endif() -endif() -# Define settings for the Profile build mode. -set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") -set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") -set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") -set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") - -# Use Unicode for all projects. -add_definitions(-DUNICODE -D_UNICODE) - -# Compilation settings that should be applied to most targets. -# -# Be cautious about adding new options here, as plugins use this function by -# default. In most cases, you should add new options to specific targets instead -# of modifying this function. -function(APPLY_STANDARD_SETTINGS TARGET) - target_compile_features(${TARGET} PUBLIC cxx_std_17) - target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") - target_compile_options(${TARGET} PRIVATE /EHsc) - target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") - target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") -endfunction() - -# Flutter library and tool build rules. -set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") -add_subdirectory(${FLUTTER_MANAGED_DIR}) - -# Application build; see runner/CMakeLists.txt. -add_subdirectory("runner") - - -# Generated plugin build rules, which manage building the plugins and adding -# them to the application. -include(flutter/generated_plugins.cmake) - - -# === Installation === -# Support files are copied into place next to the executable, so that it can -# run in place. This is done instead of making a separate bundle (as on Linux) -# so that building and running from within Visual Studio will work. -set(BUILD_BUNDLE_DIR "$") -# Make the "install" step default, as it's required to run. -set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) -endif() - -set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") -set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") - -install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - COMPONENT Runtime) - -install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -if(PLUGIN_BUNDLED_LIBRARIES) - install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) -endif() - -# Copy the native assets provided by the build.dart from all packages. -set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") -install(DIRECTORY "${NATIVE_ASSETS_DIR}" - DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" - COMPONENT Runtime) - -# Fully re-copy the assets directory on each build to avoid having stale files -# from a previous install. -set(FLUTTER_ASSET_DIR_NAME "flutter_assets") -install(CODE " - file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") - " COMPONENT Runtime) -install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" - DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) - -# Install the AOT library on non-Debug builds only. -install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" - CONFIGURATIONS Profile;Release - COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt deleted file mode 100755 index efb62eb..0000000 --- a/windows/flutter/CMakeLists.txt +++ /dev/null @@ -1,109 +0,0 @@ -# This file controls Flutter-level build steps. It should not be edited. -cmake_minimum_required(VERSION 3.14) - -set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") - -# Configuration provided via flutter tool. -include(${EPHEMERAL_DIR}/generated_config.cmake) - -# TODO: Move the rest of this into files in ephemeral. See -# https://github.com/flutter/flutter/issues/57146. -set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") - -# Set fallback configurations for older versions of the flutter tool. -if (NOT DEFINED FLUTTER_TARGET_PLATFORM) - set(FLUTTER_TARGET_PLATFORM "windows-x64") -endif() - -# === Flutter Library === -set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") - -# Published to parent scope for install step. -set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) -set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) -set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) -set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) - -list(APPEND FLUTTER_LIBRARY_HEADERS - "flutter_export.h" - "flutter_windows.h" - "flutter_messenger.h" - "flutter_plugin_registrar.h" - "flutter_texture_registrar.h" -) -list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") -add_library(flutter INTERFACE) -target_include_directories(flutter INTERFACE - "${EPHEMERAL_DIR}" -) -target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") -add_dependencies(flutter flutter_assemble) - -# === Wrapper === -list(APPEND CPP_WRAPPER_SOURCES_CORE - "core_implementations.cc" - "standard_codec.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_PLUGIN - "plugin_registrar.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") -list(APPEND CPP_WRAPPER_SOURCES_APP - "flutter_engine.cc" - "flutter_view_controller.cc" -) -list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") - -# Wrapper sources needed for a plugin. -add_library(flutter_wrapper_plugin STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} -) -apply_standard_settings(flutter_wrapper_plugin) -set_target_properties(flutter_wrapper_plugin PROPERTIES - POSITION_INDEPENDENT_CODE ON) -set_target_properties(flutter_wrapper_plugin PROPERTIES - CXX_VISIBILITY_PRESET hidden) -target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) -target_include_directories(flutter_wrapper_plugin PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_plugin flutter_assemble) - -# Wrapper sources needed for the runner. -add_library(flutter_wrapper_app STATIC - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_APP} -) -apply_standard_settings(flutter_wrapper_app) -target_link_libraries(flutter_wrapper_app PUBLIC flutter) -target_include_directories(flutter_wrapper_app PUBLIC - "${WRAPPER_ROOT}/include" -) -add_dependencies(flutter_wrapper_app flutter_assemble) - -# === Flutter tool backend === -# _phony_ is a non-existent file to force this command to run every time, -# since currently there's no way to get a full input/output list from the -# flutter tool. -set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") -set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) -add_custom_command( - OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} - ${PHONY_OUTPUT} - COMMAND ${CMAKE_COMMAND} -E env - ${FLUTTER_TOOL_ENVIRONMENT} - "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - ${FLUTTER_TARGET_PLATFORM} $ - VERBATIM -) -add_custom_target(flutter_assemble DEPENDS - "${FLUTTER_LIBRARY}" - ${FLUTTER_LIBRARY_HEADERS} - ${CPP_WRAPPER_SOURCES_CORE} - ${CPP_WRAPPER_SOURCES_PLUGIN} - ${CPP_WRAPPER_SOURCES_APP} -) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc deleted file mode 100755 index 8b6d468..0000000 --- a/windows/flutter/generated_plugin_registrant.cc +++ /dev/null @@ -1,11 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#include "generated_plugin_registrant.h" - - -void RegisterPlugins(flutter::PluginRegistry* registry) { -} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h deleted file mode 100755 index dc139d8..0000000 --- a/windows/flutter/generated_plugin_registrant.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Generated file. Do not edit. -// - -// clang-format off - -#ifndef GENERATED_PLUGIN_REGISTRANT_ -#define GENERATED_PLUGIN_REGISTRANT_ - -#include - -// Registers Flutter plugins. -void RegisterPlugins(flutter::PluginRegistry* registry); - -#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake deleted file mode 100755 index b93c4c3..0000000 --- a/windows/flutter/generated_plugins.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# -# Generated file, do not edit. -# - -list(APPEND FLUTTER_PLUGIN_LIST -) - -list(APPEND FLUTTER_FFI_PLUGIN_LIST -) - -set(PLUGIN_BUNDLED_LIBRARIES) - -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) - -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt deleted file mode 100755 index 2041a04..0000000 --- a/windows/runner/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(runner LANGUAGES CXX) - -# Define the application target. To change its name, change BINARY_NAME in the -# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer -# work. -# -# Any new source files that you add to the application should be added here. -add_executable(${BINARY_NAME} WIN32 - "flutter_window.cpp" - "main.cpp" - "utils.cpp" - "win32_window.cpp" - "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" - "Runner.rc" - "runner.exe.manifest" -) - -# Apply the standard set of build settings. This can be removed for applications -# that need different build settings. -apply_standard_settings(${BINARY_NAME}) - -# Add preprocessor definitions for the build version. -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") -target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") - -# Disable Windows macros that collide with C++ standard library functions. -target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") - -# Add dependency libraries and include directories. Add any application-specific -# dependencies here. -target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) -target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") -target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") - -# Run the Flutter tool portions of the build. This must not be removed. -add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc deleted file mode 100755 index 0f2758d..0000000 --- a/windows/runner/Runner.rc +++ /dev/null @@ -1,121 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#pragma code_page(65001) -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APP_ICON ICON "resources\\app_icon.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) -#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD -#else -#define VERSION_AS_NUMBER 1,0,0,0 -#endif - -#if defined(FLUTTER_VERSION) -#define VERSION_AS_STRING FLUTTER_VERSION -#else -#define VERSION_AS_STRING "1.0.0" -#endif - -VS_VERSION_INFO VERSIONINFO - FILEVERSION VERSION_AS_NUMBER - PRODUCTVERSION VERSION_AS_NUMBER - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_APP - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", "net.seven.nodebase" "\0" - VALUE "FileDescription", "nodebase" "\0" - VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "nodebase" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 net.seven.nodebase. All rights reserved." "\0" - VALUE "OriginalFilename", "nodebase.exe" "\0" - VALUE "ProductName", "nodebase" "\0" - VALUE "ProductVersion", VERSION_AS_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_dart.h b/windows/runner/flutter_dart.h deleted file mode 100755 index 145282d..0000000 --- a/windows/runner/flutter_dart.h +++ /dev/null @@ -1,521 +0,0 @@ -#ifndef _FLUTTER_DART_ -#define _FLUTTER_DART_ -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include "utils.h" - -class NodeAppMonitor; -class NodeBaseEventChannelHandler; -void utilEventPostMessage(std::string&& name, flutter::EncodableValue&& val); - -enum NodeAppSTAT { - BORN, READY, RUNNING, DEAD -}; - -class NodeAppMonitor { -public: - NodeAppMonitor(const std::string &name, const std::vector &cmd, const std::map &env) { - this->name = name; - this->cmd = cmd; - this->env = env; - this->stat = NodeAppSTAT::BORN; - ZeroMemory(&this->pi, sizeof(this->pi)); - this->pth = std::thread(NodeAppMonitor::Run, this); - } - ~NodeAppMonitor() { - this->Stop(); - if (this->pth.joinable()) this->pth.join(); - } - - void Start() { - this->stat = NodeAppSTAT::READY; - STARTUPINFO si; - SecureZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - SecureZeroMemory(&this->pi, sizeof(this->pi)); - std::wstring prog = Utf8ToUtf16((*(this->cmd.begin())).c_str()); - std::wstring cmdLine = this->BuildCommandLine(); - std::wstring envStr = this->BuildEnvironment(); - // ref: https://forums.codeguru.com/showthread.php?514716-std-string-to-LPSTR - LPWSTR cmdLineAdapter = &cmdLine.front(); - if (!CreateProcess( - prog.c_str(), - cmdLineAdapter, - nullptr, - nullptr, - TRUE, - CREATE_UNICODE_ENVIRONMENT, - this->env.size() == 0 ? nullptr : (LPVOID)(envStr.c_str()), - nullptr, - &si, - &pi) - ) { - this->stat = NodeAppSTAT::DEAD; - printf( - "NodeAppMonitor [E] \"%s\" start failure on CreateProcess.", - this->name.c_str() - ); - return; - } - this->stat = NodeAppSTAT::RUNNING; - - { - flutter::EncodableList r; - r.push_back(flutter::EncodableValue("start")); - r.push_back(flutter::EncodableValue(name)); - utilEventPostMessage("app", flutter::EncodableValue(r)); - } - - WaitForSingleObject( this->pi.hProcess, INFINITE ); - this->stat = NodeAppSTAT::DEAD; - CloseHandle( this->pi.hProcess ); - CloseHandle( this->pi.hThread ); - - { - flutter::EncodableList r; - r.push_back(flutter::EncodableValue("stop")); - r.push_back(flutter::EncodableValue(name)); - utilEventPostMessage("app", flutter::EncodableValue(r)); - } - } - - void Stop() { - if (!this->IsRunning()) return; - if (!this->pi.hProcess) return; - TerminateProcess(this->pi.hProcess, 0); - this->stat = NodeAppSTAT::DEAD; - const DWORD r = WaitForSingleObject(this->pi.hProcess, 500); - if (r == WAIT_OBJECT_0) { - // TODO: ok - } else { - printf( - "NodeAppMonitor [E] \"%s\" stop failure on TerminateProcess.", - this->name.c_str() - ); - // TODO: failured - } - CloseHandle(this->pi.hProcess); - CloseHandle(this->pi.hThread); - } - - NodeAppMonitor* restart() { - this->Stop(); - return new NodeAppMonitor(this->name, this->cmd, this->env); - } - flutter::EncodableValue toJSON() { - std::string rstat = "none"; - switch (this->stat) { - case NodeAppSTAT::RUNNING: - rstat = "running"; - break; - case NodeAppSTAT::DEAD: - rstat = "dead"; - break; - case NodeAppSTAT::READY: - rstat = "new"; - break; - case NodeAppSTAT::BORN: - default: - break; - } - flutter::EncodableMap r = { - {flutter::EncodableValue("state"), flutter::EncodableValue(rstat)}, - }; - return flutter::EncodableValue(r); - } - - bool IsRunning() { return this->stat == NodeAppSTAT::RUNNING; } - bool IsDead() { return this->stat == NodeAppSTAT::DEAD; } - - std::string GetName() { return this->name; } - std::vector GetCmd() { return this->cmd; } - std::map GetEnv() { return this->env; } -private: - static void Run(NodeAppMonitor* app) { - app->Start(); - } - - std::wstring BuildCommandLine() { - std::wostringstream os; - // process command line to deal with space and special characters - // e.g. convert 'a "\b c' into '"a ""\\b c"' - for (auto i = this->cmd.begin(); i != this->cmd.end(); i++) { - std::wstring one = Utf8ToUtf16(i->c_str()); - this->replaceAllW(one, L"\\", L"\\\\"); - this->replaceAllW(one, L"\"", L"\"\""); - os << L'"' << one << L'"' << L' '; - } - return os.str(); - } - - std::wstring BuildEnvironment() { - std::wostringstream os; - // TODO+XXX: process env to deal with space and special characters - for (auto i = this->env.begin(); i != this->env.end(); i++) { - os << Utf8ToUtf16(i->first.c_str()) << L'='; - os << Utf8ToUtf16(i->second.c_str()) << L'\x00'; - } - os << L'\x00'; - return os.str(); - } - - // ref: https://stackoverflow.com/questions/2896600/how-to-replace-all-occurrences-of-a-character-in-string - int replaceAllW(std::wstring& str, const std::wstring& from, const std::wstring& to) { - int count = 0; - size_t start_pos = 0; - while((start_pos = str.find(from, start_pos)) != std::wstring::npos) { - str.replace(start_pos, from.length(), to); - start_pos += to.length(); - count++; - } - return count; - } - -private: - NodeAppSTAT stat; - std::string name; - std::vector cmd; - std::map env; - std::thread pth; - PROCESS_INFORMATION pi; -}; - -// ref: https://stackoverflow.com/questions/24764477/network-adapter-information-in-c -// ref: https://learn.microsoft.com/zh-cn/windows/win32/api/iphlpapi/nf-iphlpapi-getadaptersaddresses?redirectedfrom=MSDN -static int getIPAdresses(flutter::EncodableMap& out) { - int count = 0; - - char buf[32*1024]; - ULONG pAddresses_len = sizeof(buf); - IP_ADAPTER_ADDRESSES * pAddresses = (IP_ADAPTER_ADDRESSES *)buf; - DWORD dwRetVal = GetAdaptersAddresses( - AF_UNSPEC, - GAA_FLAG_INCLUDE_PREFIX, - nullptr, - pAddresses, - &pAddresses_len - ); - if (dwRetVal == NO_ERROR) { - IP_ADAPTER_ADDRESSES *pCurrAddresses = pAddresses; - out.clear(); - while (pCurrAddresses) { - int n = (int)(pCurrAddresses->PhysicalAddressLength); - if (n > 0) { - // pCurrAddresses->AdapterName is in a format like {xxxx-yyyy-zzzz...} - flutter::EncodableValue name(Utf8FromUtf16(pCurrAddresses->FriendlyName)); - flutter::EncodableList arr; - for (IP_ADAPTER_UNICAST_ADDRESS* pUnicast = pCurrAddresses->FirstUnicastAddress; pUnicast != NULL; pUnicast = pUnicast->Next) { - wchar_t ipAddress[INET6_ADDRSTRLEN] = {0}; - void* pAddr = nullptr; - - // Determine the family of the IP address - if (pUnicast->Address.lpSockaddr->sa_family == AF_INET) { - // It's an IPv4 address - pAddr = &((struct sockaddr_in*)pUnicast->Address.lpSockaddr)->sin_addr; - } else if (pUnicast->Address.lpSockaddr->sa_family == AF_INET6) { - // It's an IPv6 address - pAddr = &((struct sockaddr_in6*)pUnicast->Address.lpSockaddr)->sin6_addr; - } - - // Convert the binary IP address to a string - if (pAddr) { - InetNtop(pUnicast->Address.lpSockaddr->sa_family, pAddr, ipAddress, sizeof(ipAddress)); - arr.push_back(flutter::EncodableValue(Utf8FromUtf16(ipAddress))); - } - } - out.insert_or_assign(name, arr); - } - pCurrAddresses = pCurrAddresses->Next; - count++; - } - } else { - // TODO: handle error - count = -1; - } - return count; -} - -class NodeBaseEventChannelHandler { -public: - NodeBaseEventChannelHandler(std::string&& channel_name, flutter::FlutterEngine* flutter_instance) { - auto event_channel = - std::make_unique>( - flutter_instance->messenger(), channel_name, - &flutter::StandardMethodCodec::GetInstance()); - - auto event_channel_handler = std::make_unique< - flutter::StreamHandlerFunctions>( - [this]( - const flutter::EncodableValue* arguments, - std::unique_ptr>&& events - ) -> std::unique_ptr> { - std::string name = EncodableValue2String(arguments); - this->sink.insert_or_assign(name, std::move(events)); - return nullptr; - }, - [this](const flutter::EncodableValue* arguments) - -> std::unique_ptr> { - // TODO: replace as find and erase - std::string name = EncodableValue2String(arguments); - this->sink.insert_or_assign(name, nullptr); - return nullptr; - }); - event_channel->SetStreamHandler(std::move(event_channel_handler)); - } - - void postMessage(std::string&& name, flutter::EncodableValue message) { - auto target_ = this->sink.find(name); - if (target_ == this->sink.end()) return; - if (!target_->second) return; - //auto target = target_->second; - target_->second->Success(message); - } -private: - std::string EncodableValue2String(const flutter::EncodableValue* val) { - if (!val || val->IsNull()) { - return std::string(""); - } - - if (std::holds_alternative(*val)) { - return std::get(*val); - } - - return std::string(""); - } -private: - std::map>> sink; -}; - -static std::map services; -static std::mutex service_lock; -static std::unique_ptr eventHandler; - -void utilEventPostMessage(std::string&& name, flutter::EncodableValue&& val) { - if (eventHandler == nullptr) return; - /* - * XXX: annoying warning but no non-hacking solution yet, - * need help from `fml` namespace - * general idea: - * - when init channels, get current thread id - * - using the thread id to get task runner - * - do post task here - * [eventHandler=eventHandler.get(),name=std::move(name),val]() {...}; - * - * The 'net.seven.nodebase/event' channel sent a message from native to Flutter on - * a non-platform thread. Platform channel messages must be sent on the platform - * thread. Failure to do so may result in data loss or crashes, and must be fixed - * in the plugin or application code creating that channel. - */ - eventHandler->postMessage(std::move(name), val); -} - -void appStart(const std::string &name, const std::vector &cmd, const std::map &env) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - NodeAppMonitor *app; - if (app_ != services.end()) { - app = app_->second; - services.erase(name); - delete app; - } - app = new NodeAppMonitor(name, cmd, env); - // TODO: if (!app) {} // memory allocate failure - services.insert_or_assign(name, app); -} -void appStop(const std::string &name) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - if (app_ == services.end()) return; - NodeAppMonitor *app = app_->second; - app->Stop(); -} -bool appRestart(const std::string &name) { - std::lock_guard guard(service_lock); - auto app_ = services.find(name); - if (app_ == services.end()) return false; - NodeAppMonitor *app = app_->second; - app->Stop(); - NodeAppMonitor *newapp = app->restart(); - if (newapp == nullptr) { - return false; - } - delete app; - services.insert_or_assign(name, newapp); - return true; -} -flutter::EncodableValue appStat(const std::string &name) { - auto app_ = services.find(name); - if (app_ == services.end()) return flutter::EncodableValue(flutter::EncodableMap()); - NodeAppMonitor *app = app_->second; - return app->toJSON(); -} -flutter::EncodableValue utilGetIPs() { - flutter::EncodableMap ips; - getIPAdresses(ips); - return flutter::EncodableValue(ips); -} -void utilBrowserOpen(const std::string &url) { - if (url.rfind("http:", 0) != 0 && url.rfind("https:", 0) != 0) return; - ShellExecuteA(0, 0, url.c_str(), 0, 0 , SW_SHOW ); -} -flutter::EncodableValue utilGetArch() { - std::string arch("windows-"); - SYSTEM_INFO si; - // XXX: GetSystemInfo(&si) for old windows, maybe we can use LoadLibrary for test - GetNativeSystemInfo(&si); - switch(si.wProcessorArchitecture) { - // compatible with GetSystemInfo - case PROCESSOR_ARCHITECTURE_AMD64: - arch += "x64|x86"; - break; - case PROCESSOR_ARCHITECTURE_INTEL: - arch += "x86"; - break; - // new - case PROCESSOR_ARCHITECTURE_ARM: - arch += "arm"; - break; - case PROCESSOR_ARCHITECTURE_ARM64: - arch += "arm64|arm"; - break; - case PROCESSOR_ARCHITECTURE_IA64: - arch += "x64|x86"; - break; - } - return flutter::EncodableValue(arch); -} -flutter::EncodableValue utilWorkspaceBaseDir() { - TCHAR buf[1024]; - if (!GetModuleFileName(NULL, buf, 1024)) return flutter::EncodableValue(std::string("")); - buf[1023] = 0; - TCHAR* last = wcsrchr(buf, L'\\'); - if (last == nullptr || last == buf || last == &(buf[1]) || last == &(buf[2])) { - // not found, buf = "\\", buf = "\\\\", buf = "c:\\" - return flutter::EncodableValue(std::string("")); - } - last[0] = 0; - return flutter::EncodableValue(Utf8FromUtf16(buf)); -} - -#define RETURN_BADARG_ERR(x) { result->Error("BAD_ARGS", "Invalid argument type for '" #x "'"); return; } -void InitMethodChannel(flutter::FlutterEngine* flutter_instance) { - // name your channel - const static std::string channel_name("net.seven.nodebase/app"); - - auto channel = - std::make_unique>( - flutter_instance->messenger(), channel_name, - &flutter::StandardMethodCodec::GetInstance()); - - channel->SetMethodCallHandler( - [](const flutter::MethodCall& call, - std::unique_ptr> result) { - - const auto* args = std::get_if(call.arguments()); - if (call.method_name().compare("app.stat") == 0) { - if (args == nullptr) RETURN_BADARG_ERR(app.stat); - auto name_ = args->find(flutter::EncodableValue("name")); - if (name_ == args->end()) RETURN_BADARG_ERR(app.stat); - std::string name = std::get(name_->second); - result->Success(appStat(name)); - } - else if (call.method_name().compare("app.start") == 0) { - if (args == nullptr) RETURN_BADARG_ERR(app.start); - auto name_ = args->find(flutter::EncodableValue("name")); - if (name_ == args->end()) RETURN_BADARG_ERR(app.start); - auto cmd_ = args->find(flutter::EncodableValue("cmd")); - if (cmd_ == args->end()) RETURN_BADARG_ERR(app.start); - auto env_ = args->find(flutter::EncodableValue("env")); - if (env_ == args->end()) RETURN_BADARG_ERR(app.start); - std::string name = std::get(name_->second); - - flutter::EncodableList cmdRaw = std::get(cmd_->second); - std::vector cmd; - cmd.reserve(cmdRaw.size()); - for (const auto &val : cmdRaw) { - cmd.push_back(std::get(val)); - } - - flutter::EncodableMap envRaw = std::get(env_->second); - std::map env; - for (const auto &val : envRaw) { - env.insert_or_assign( - std::get(val.first), - std::get(val.second) - ); - } - appStart(name, cmd, env); - result->Success(); - } - else if (call.method_name().compare("app.restart") == 0) { - if (args == nullptr) RETURN_BADARG_ERR(app.restart); - auto name_ = args->find(flutter::EncodableValue("name")); - if (name_ == args->end()) RETURN_BADARG_ERR(app.restart); - std::string name = std::get(name_->second); - if (!appRestart(name)) { - std::ostringstream msg; - msg << "Restart failed for app \"" << name << "\""; - result->Error("FAILURE", msg.str()); - return; - } - result->Success(); - } - else if (call.method_name().compare("app.stop") == 0) { - if (args == nullptr) RETURN_BADARG_ERR(app.stop); - auto name_ = args->find(flutter::EncodableValue("name")); - if (name_ == args->end()) RETURN_BADARG_ERR(app.stop); - std::string name = std::get(name_->second); - appStop(name); - result->Success(); - } - else if (call.method_name().compare("util.ip") == 0) { - result->Success(utilGetIPs()); - } - else if (call.method_name().compare("util.file.executable") == 0) { - // in windows, we may not need to implement this; - // PE file can be executable directly without additional flag by default - /* - if (args == nullptr) RETURN_BADARG_ERR(util.file.executable); - auto name = args->find(flutter::EncodableValue("filename"))->second; - if (name.IsNull()) RETURN_BADARG_ERR(util.file.executable); - ... - */ - result->Success(); - } - else if (call.method_name().compare("util.browser.open") == 0) { - if (args == nullptr) RETURN_BADARG_ERR(util.browser.open); - auto url_ = args->find(flutter::EncodableValue("url")); - if (url_ == args->end()) RETURN_BADARG_ERR(util.browser.open); - std::string url = std::get(url_->second); - utilBrowserOpen(url); - result->Success(); - } - else if (call.method_name().compare("util.arch") == 0) { - result->Success(utilGetArch()); - } - else if (call.method_name().compare("util.workspace") == 0) { - result->Success(utilWorkspaceBaseDir()); - } - else { - result->NotImplemented(); - } - }); -} -#undef RETURN_BADARG_ERR - -void InitEventChannel(flutter::FlutterEngine* flutter_instance) { - eventHandler = std::make_unique( - std::string("net.seven.nodebase/event"), flutter_instance); -} -#endif // _FLUTTER_DART_ \ No newline at end of file diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp deleted file mode 100755 index 5015640..0000000 --- a/windows/runner/flutter_window.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// XXX ugly include, what a pity is windows.h uses winsock.h by default -// should define winsock2.h before windows.h -#include -#include -#include -#pragma comment(lib, "Ws2_32.lib") -#pragma comment(lib, "IPHLPAPI.lib") -#include -#include "flutter_window.h" - -#include - -#include "flutter/generated_plugin_registrant.h" -#include "flutter_dart.h" - -FlutterWindow::FlutterWindow(const flutter::DartProject& project) - : project_(project) {} - -FlutterWindow::~FlutterWindow() {} - -bool FlutterWindow::OnCreate() { - if (!Win32Window::OnCreate()) { - return false; - } - - RECT frame = GetClientArea(); - - // The size here must match the window dimensions to avoid unnecessary surface - // creation / destruction in the startup path. - flutter_controller_ = std::make_unique( - frame.right - frame.left, frame.bottom - frame.top, project_); - // Ensure that basic setup of the controller was successful. - if (!flutter_controller_->engine() || !flutter_controller_->view()) { - return false; - } - RegisterPlugins(flutter_controller_->engine()); - InitMethodChannel(flutter_controller_->engine()); - InitEventChannel(flutter_controller_->engine()); - SetChildContent(flutter_controller_->view()->GetNativeWindow()); - - flutter_controller_->engine()->SetNextFrameCallback([&]() { - this->Show(); - }); - - // Flutter can complete the first frame before the "show window" callback is - // registered. The following call ensures a frame is pending to ensure the - // window is shown. It is a no-op if the first frame hasn't completed yet. - flutter_controller_->ForceRedraw(); - - return true; -} - -void FlutterWindow::OnDestroy() { - if (flutter_controller_) { - flutter_controller_ = nullptr; - } - - Win32Window::OnDestroy(); -} - -LRESULT -FlutterWindow::MessageHandler(HWND hwnd, UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - // Give Flutter, including plugins, an opportunity to handle window messages. - if (flutter_controller_) { - std::optional result = - flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, - lparam); - if (result) { - return *result; - } - } - - switch (message) { - case WM_FONTCHANGE: - flutter_controller_->engine()->ReloadSystemFonts(); - break; - } - - return Win32Window::MessageHandler(hwnd, message, wparam, lparam); -} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h deleted file mode 100755 index 28c2383..0000000 --- a/windows/runner/flutter_window.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef RUNNER_FLUTTER_WINDOW_H_ -#define RUNNER_FLUTTER_WINDOW_H_ - -#include -#include - -#include - -#include "win32_window.h" - -// A window that does nothing but host a Flutter view. -class FlutterWindow : public Win32Window { - public: - // Creates a new FlutterWindow hosting a Flutter view running |project|. - explicit FlutterWindow(const flutter::DartProject& project); - virtual ~FlutterWindow(); - - protected: - // Win32Window: - bool OnCreate() override; - void OnDestroy() override; - LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, - LPARAM const lparam) noexcept override; - - private: - // The project to run. - flutter::DartProject project_; - - // The Flutter instance hosted by this window. - std::unique_ptr flutter_controller_; -}; - -#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp deleted file mode 100755 index 30682ea..0000000 --- a/windows/runner/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include - -#include "flutter_window.h" -#include "utils.h" - -int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, - _In_ wchar_t *command_line, _In_ int show_command) { - // Attach to console when present (e.g., 'flutter run') or create a - // new console when running with a debugger. - if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { - CreateAndAttachConsole(); - } - - // Initialize COM, so that it is available for use in the library and/or - // plugins. - ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - - flutter::DartProject project(L"data"); - - std::vector command_line_arguments = - GetCommandLineArguments(); - - project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); - - FlutterWindow window(project); - Win32Window::Point origin(10, 10); - Win32Window::Size size(360, 720); - if (!window.Create(L"nodebase", origin, size)) { - return EXIT_FAILURE; - } - window.SetQuitOnClose(true); - - ::MSG msg; - while (::GetMessage(&msg, nullptr, 0, 0)) { - ::TranslateMessage(&msg); - ::DispatchMessage(&msg); - } - - ::CoUninitialize(); - return EXIT_SUCCESS; -} diff --git a/windows/runner/resource.h b/windows/runner/resource.h deleted file mode 100755 index ddc7f3e..0000000 --- a/windows/runner/resource.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Runner.rc -// -#define IDI_APP_ICON 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico deleted file mode 100755 index c04e20caf6370ebb9253ad831cc31de4a9c965f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33772 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 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest deleted file mode 100755 index fbff8fc..0000000 --- a/windows/runner/runner.exe.manifest +++ /dev/null @@ -1,21 +0,0 @@ - - - - - PerMonitorV2 - true - - - - - - - - - - - - - - - diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp deleted file mode 100755 index 968e5ee..0000000 --- a/windows/runner/utils.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "utils.h" - -#include -#include -#include -#include - -#include - -void CreateAndAttachConsole() { - if (::AllocConsole()) { - FILE *unused; - if (freopen_s(&unused, "CONOUT$", "w", stdout)) { - _dup2(_fileno(stdout), 1); - } - if (freopen_s(&unused, "CONOUT$", "w", stderr)) { - _dup2(_fileno(stdout), 2); - } - std::ios::sync_with_stdio(); - FlutterDesktopResyncOutputStreams(); - } -} - -std::vector GetCommandLineArguments() { - // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. - int argc; - wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); - if (argv == nullptr) { - return std::vector(); - } - - std::vector command_line_arguments; - - // Skip the first argument as it's the binary name. - for (int i = 1; i < argc; i++) { - command_line_arguments.push_back(Utf8FromUtf16(argv[i])); - } - - ::LocalFree(argv); - - return command_line_arguments; -} - -std::string Utf8FromUtf16(const wchar_t* utf16_string) { - if (utf16_string == nullptr) { - return std::string(); - } - int target_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr) - -1; // remove the trailing null character - int input_length = (int)wcslen(utf16_string); - std::string utf8_string; - if (target_length <= 0 || target_length > utf8_string.max_size()) { - return utf8_string; - } - utf8_string.resize(target_length); - int converted_length = ::WideCharToMultiByte( - CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - input_length, utf8_string.data(), target_length, nullptr, nullptr); - if (converted_length == 0) { - return std::string(); - } - return utf8_string; -} - -std::wstring Utf8ToUtf16(const char* utf8_string) { - // ref: filled by chatGPT 4 turbo - if (utf8_string == nullptr) { - return std::wstring(); // Return an empty wstring if the input is null. - } - - // Calculate the length of the resulting wide string. - int wide_char_length = MultiByteToWideChar( - CP_UTF8, // Source string is in UTF-8 - 0, // No flags - utf8_string, // Source UTF-8 string - -1, // The string is null-terminated - nullptr, // No output buffer since we're calculating the length - 0 // Request length calculation - ); - - if (wide_char_length == 0) { - // Handle the error, could be due to an invalid UTF-8 sequence. - // GetLastError() can be used to get more information. - return std::wstring(); - } - - // Allocate a buffer for the wide string. - std::wstring utf16_string(wide_char_length, L'\0'); - - // Now convert the UTF-8 string to UTF-16. - int convert_result = MultiByteToWideChar( - CP_UTF8, // Source string is in UTF-8 - 0, // No flags - utf8_string, // Source UTF-8 string - -1, // The string is null-terminated - &utf16_string[0], // Output buffer for the wide string - wide_char_length // Size of the output buffer - ); - - if (convert_result == 0) { - // Handle the error, could be due to an invalid UTF-8 sequence. - // GetLastError() can be used to get more information. - return std::wstring(); - } - - // The length includes the null terminator, so we resize to remove it. - utf16_string.resize(wide_char_length - 1); - - return utf16_string; -} \ No newline at end of file diff --git a/windows/runner/utils.h b/windows/runner/utils.h deleted file mode 100755 index 13e37c8..0000000 --- a/windows/runner/utils.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef RUNNER_UTILS_H_ -#define RUNNER_UTILS_H_ - -#include -#include - -// Creates a console for the process, and redirects stdout and stderr to -// it for both the runner and the Flutter library. -void CreateAndAttachConsole(); - -// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string -// encoded in UTF-8. Returns an empty std::string on failure. -std::string Utf8FromUtf16(const wchar_t* utf16_string); -std::wstring Utf8ToUtf16(const char* utf8_string); - -// Gets the command line arguments passed in as a std::vector, -// encoded in UTF-8. Returns an empty std::vector on failure. -std::vector GetCommandLineArguments(); - -#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp deleted file mode 100755 index 1b2adca..0000000 --- a/windows/runner/win32_window.cpp +++ /dev/null @@ -1,288 +0,0 @@ -#include "win32_window.h" - -#include -#include - -#include "resource.h" - -namespace { - -/// Window attribute that enables dark mode window decorations. -/// -/// Redefined in case the developer's machine has a Windows SDK older than -/// version 10.0.22000.0. -/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute -#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE -#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 -#endif - -constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; - -/// Registry key for app theme preference. -/// -/// A value of 0 indicates apps should use dark mode. A non-zero or missing -/// value indicates apps should use light mode. -constexpr const wchar_t kGetPreferredBrightnessRegKey[] = - L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; -constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; - -// The number of Win32Window objects that currently exist. -static int g_active_window_count = 0; - -using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); - -// Scale helper to convert logical scaler values to physical using passed in -// scale factor -int Scale(int source, double scale_factor) { - return static_cast(source * scale_factor); -} - -// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. -// This API is only needed for PerMonitor V1 awareness mode. -void EnableFullDpiSupportIfAvailable(HWND hwnd) { - HMODULE user32_module = LoadLibraryA("User32.dll"); - if (!user32_module) { - return; - } - auto enable_non_client_dpi_scaling = - reinterpret_cast( - GetProcAddress(user32_module, "EnableNonClientDpiScaling")); - if (enable_non_client_dpi_scaling != nullptr) { - enable_non_client_dpi_scaling(hwnd); - } - FreeLibrary(user32_module); -} - -} // namespace - -// Manages the Win32Window's window class registration. -class WindowClassRegistrar { - public: - ~WindowClassRegistrar() = default; - - // Returns the singleton registrar instance. - static WindowClassRegistrar* GetInstance() { - if (!instance_) { - instance_ = new WindowClassRegistrar(); - } - return instance_; - } - - // Returns the name of the window class, registering the class if it hasn't - // previously been registered. - const wchar_t* GetWindowClass(); - - // Unregisters the window class. Should only be called if there are no - // instances of the window. - void UnregisterWindowClass(); - - private: - WindowClassRegistrar() = default; - - static WindowClassRegistrar* instance_; - - bool class_registered_ = false; -}; - -WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; - -const wchar_t* WindowClassRegistrar::GetWindowClass() { - if (!class_registered_) { - WNDCLASS window_class{}; - window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); - window_class.lpszClassName = kWindowClassName; - window_class.style = CS_HREDRAW | CS_VREDRAW; - window_class.cbClsExtra = 0; - window_class.cbWndExtra = 0; - window_class.hInstance = GetModuleHandle(nullptr); - window_class.hIcon = - LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); - window_class.hbrBackground = 0; - window_class.lpszMenuName = nullptr; - window_class.lpfnWndProc = Win32Window::WndProc; - RegisterClass(&window_class); - class_registered_ = true; - } - return kWindowClassName; -} - -void WindowClassRegistrar::UnregisterWindowClass() { - UnregisterClass(kWindowClassName, nullptr); - class_registered_ = false; -} - -Win32Window::Win32Window() { - ++g_active_window_count; -} - -Win32Window::~Win32Window() { - --g_active_window_count; - Destroy(); -} - -bool Win32Window::Create(const std::wstring& title, - const Point& origin, - const Size& size) { - Destroy(); - - const wchar_t* window_class = - WindowClassRegistrar::GetInstance()->GetWindowClass(); - - const POINT target_point = {static_cast(origin.x), - static_cast(origin.y)}; - HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); - UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); - double scale_factor = dpi / 96.0; - - HWND window = CreateWindow( - window_class, title.c_str(), WS_OVERLAPPEDWINDOW ^ (WS_THICKFRAME | WS_MAXIMIZEBOX), - Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), - Scale(size.width, scale_factor), Scale(size.height, scale_factor), - nullptr, nullptr, GetModuleHandle(nullptr), this); - - if (!window) { - return false; - } - - UpdateTheme(window); - - return OnCreate(); -} - -bool Win32Window::Show() { - return ShowWindow(window_handle_, SW_SHOWNORMAL); -} - -// static -LRESULT CALLBACK Win32Window::WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - if (message == WM_NCCREATE) { - auto window_struct = reinterpret_cast(lparam); - SetWindowLongPtr(window, GWLP_USERDATA, - reinterpret_cast(window_struct->lpCreateParams)); - - auto that = static_cast(window_struct->lpCreateParams); - EnableFullDpiSupportIfAvailable(window); - that->window_handle_ = window; - } else if (Win32Window* that = GetThisFromHandle(window)) { - return that->MessageHandler(window, message, wparam, lparam); - } - - return DefWindowProc(window, message, wparam, lparam); -} - -LRESULT -Win32Window::MessageHandler(HWND hwnd, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept { - switch (message) { - case WM_DESTROY: - window_handle_ = nullptr; - Destroy(); - if (quit_on_close_) { - PostQuitMessage(0); - } - return 0; - - case WM_DPICHANGED: { - auto newRectSize = reinterpret_cast(lparam); - LONG newWidth = newRectSize->right - newRectSize->left; - LONG newHeight = newRectSize->bottom - newRectSize->top; - - SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, - newHeight, SWP_NOZORDER | SWP_NOACTIVATE); - - return 0; - } - case WM_SIZE: { - RECT rect = GetClientArea(); - if (child_content_ != nullptr) { - // Size and position the child window. - MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top, TRUE); - } - return 0; - } - - case WM_ACTIVATE: - if (child_content_ != nullptr) { - SetFocus(child_content_); - } - return 0; - - case WM_DWMCOLORIZATIONCOLORCHANGED: - UpdateTheme(hwnd); - return 0; - } - - return DefWindowProc(window_handle_, message, wparam, lparam); -} - -void Win32Window::Destroy() { - OnDestroy(); - - if (window_handle_) { - DestroyWindow(window_handle_); - window_handle_ = nullptr; - } - if (g_active_window_count == 0) { - WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); - } -} - -Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { - return reinterpret_cast( - GetWindowLongPtr(window, GWLP_USERDATA)); -} - -void Win32Window::SetChildContent(HWND content) { - child_content_ = content; - SetParent(content, window_handle_); - RECT frame = GetClientArea(); - - MoveWindow(content, frame.left, frame.top, frame.right - frame.left, - frame.bottom - frame.top, true); - - SetFocus(child_content_); -} - -RECT Win32Window::GetClientArea() { - RECT frame; - GetClientRect(window_handle_, &frame); - return frame; -} - -HWND Win32Window::GetHandle() { - return window_handle_; -} - -void Win32Window::SetQuitOnClose(bool quit_on_close) { - quit_on_close_ = quit_on_close; -} - -bool Win32Window::OnCreate() { - // No-op; provided for subclasses. - return true; -} - -void Win32Window::OnDestroy() { - // No-op; provided for subclasses. -} - -void Win32Window::UpdateTheme(HWND const window) { - DWORD light_mode; - DWORD light_mode_size = sizeof(light_mode); - LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, - kGetPreferredBrightnessRegValue, - RRF_RT_REG_DWORD, nullptr, &light_mode, - &light_mode_size); - - if (result == ERROR_SUCCESS) { - BOOL enable_dark_mode = light_mode == 0; - DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, - &enable_dark_mode, sizeof(enable_dark_mode)); - } -} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h deleted file mode 100755 index 49b847f..0000000 --- a/windows/runner/win32_window.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef RUNNER_WIN32_WINDOW_H_ -#define RUNNER_WIN32_WINDOW_H_ - -#include - -#include -#include -#include - -// A class abstraction for a high DPI-aware Win32 Window. Intended to be -// inherited from by classes that wish to specialize with custom -// rendering and input handling -class Win32Window { - public: - struct Point { - unsigned int x; - unsigned int y; - Point(unsigned int x, unsigned int y) : x(x), y(y) {} - }; - - struct Size { - unsigned int width; - unsigned int height; - Size(unsigned int width, unsigned int height) - : width(width), height(height) {} - }; - - Win32Window(); - virtual ~Win32Window(); - - // Creates a win32 window with |title| that is positioned and sized using - // |origin| and |size|. New windows are created on the default monitor. Window - // sizes are specified to the OS in physical pixels, hence to ensure a - // consistent size this function will scale the inputted width and height as - // as appropriate for the default monitor. The window is invisible until - // |Show| is called. Returns true if the window was created successfully. - bool Create(const std::wstring& title, const Point& origin, const Size& size); - - // Show the current window. Returns true if the window was successfully shown. - bool Show(); - - // Release OS resources associated with window. - void Destroy(); - - // Inserts |content| into the window tree. - void SetChildContent(HWND content); - - // Returns the backing Window handle to enable clients to set icon and other - // window properties. Returns nullptr if the window has been destroyed. - HWND GetHandle(); - - // If true, closing this window will quit the application. - void SetQuitOnClose(bool quit_on_close); - - // Return a RECT representing the bounds of the current client area. - RECT GetClientArea(); - - protected: - // Processes and route salient window messages for mouse handling, - // size change and DPI. Delegates handling of these to member overloads that - // inheriting classes can handle. - virtual LRESULT MessageHandler(HWND window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Called when CreateAndShow is called, allowing subclass window-related - // setup. Subclasses should return false if setup fails. - virtual bool OnCreate(); - - // Called when Destroy is called. - virtual void OnDestroy(); - - private: - friend class WindowClassRegistrar; - - // OS callback called by message pump. Handles the WM_NCCREATE message which - // is passed when the non-client area is being created and enables automatic - // non-client DPI scaling so that the non-client area automatically - // responds to changes in DPI. All other messages are handled by - // MessageHandler. - static LRESULT CALLBACK WndProc(HWND const window, - UINT const message, - WPARAM const wparam, - LPARAM const lparam) noexcept; - - // Retrieves a class instance pointer for |window| - static Win32Window* GetThisFromHandle(HWND const window) noexcept; - - // Update the window frame's theme to match the system theme. - static void UpdateTheme(HWND const window); - - bool quit_on_close_ = false; - - // window handle for top level window. - HWND window_handle_ = nullptr; - - // window handle for hosted content. - HWND child_content_ = nullptr; -}; - -#endif // RUNNER_WIN32_WINDOW_H_ From 584106fd5225106e7502b1daa71bced1446600c2 Mon Sep 17 00:00:00 2001 From: Seven Lju Date: Tue, 3 Feb 2026 23:06:11 +0800 Subject: [PATCH 120/125] init websocket/http server with netty via claude opus 4.5 - websocket/http server with netty - js client can register as a service - no auth yet - known issue: the chat and fileshare behavior is not correct it should not register when a service client use the service when service starts, it should register into the server --- README.md | 162 +--- android/README.md | 166 ++++ android/app/proguard-rules.pro | 20 + android/app/src/main/AndroidManifest.xml | 44 + .../src/main/assets/services/chat/index.html | 590 ++++++++++++++ .../main/assets/services/fileshare/index.html | 574 +++++++++++++ .../seven/lab/wstun/config/ServerConfig.java | 93 +++ .../lab/wstun/protocol/HttpRelayRequest.java | 88 ++ .../lab/wstun/protocol/HttpRelayResponse.java | 99 +++ .../seven/lab/wstun/protocol/Message.java | 128 +++ .../wstun/protocol/ServiceRegistration.java | 113 +++ .../seven/lab/wstun/server/HttpHandler.java | 762 ++++++++++++++++++ .../lab/wstun/server/LocalServiceManager.java | 425 ++++++++++ .../seven/lab/wstun/server/NettyServer.java | 167 ++++ .../lab/wstun/server/PendingRequest.java | 48 ++ .../lab/wstun/server/RequestManager.java | 140 ++++ .../lab/wstun/server/ServiceManager.java | 357 ++++++++ .../lab/wstun/server/SslContextFactory.java | 146 ++++ .../lab/wstun/server/WebSocketHandler.java | 303 +++++++ .../seven/lab/wstun/service/WSTunService.java | 239 ++++++ .../seven/lab/wstun/ui/ConfigFragment.java | 132 +++ .../java/seven/lab/wstun/ui/MainActivity.java | 141 ++++ .../seven/lab/wstun/ui/ServiceAdapter.java | 89 ++ .../seven/lab/wstun/ui/StatusFragment.java | 181 +++++ .../app/src/main/res/layout/activity_main.xml | 21 + .../src/main/res/layout/fragment_config.xml | 208 +++++ .../src/main/res/layout/fragment_status.xml | 73 ++ .../app/src/main/res/layout/item_service.xml | 53 ++ android/app/src/main/res/values/colors.xml | 10 + android/app/src/main/res/values/strings.xml | 27 + android/app/src/main/res/values/themes.xml | 12 + .../main/res/xml/network_security_config.xml | 9 + android/build.gradle | 3 + android/settings.gradle | 17 + 34 files changed, 5496 insertions(+), 144 deletions(-) create mode 100644 android/README.md create mode 100644 android/app/proguard-rules.pro create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/assets/services/chat/index.html create mode 100644 android/app/src/main/assets/services/fileshare/index.html create mode 100644 android/app/src/main/java/seven/lab/wstun/config/ServerConfig.java create mode 100644 android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayRequest.java create mode 100644 android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayResponse.java create mode 100644 android/app/src/main/java/seven/lab/wstun/protocol/Message.java create mode 100644 android/app/src/main/java/seven/lab/wstun/protocol/ServiceRegistration.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/HttpHandler.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/LocalServiceManager.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/NettyServer.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/PendingRequest.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/RequestManager.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/ServiceManager.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/SslContextFactory.java create mode 100644 android/app/src/main/java/seven/lab/wstun/server/WebSocketHandler.java create mode 100644 android/app/src/main/java/seven/lab/wstun/service/WSTunService.java create mode 100644 android/app/src/main/java/seven/lab/wstun/ui/ConfigFragment.java create mode 100644 android/app/src/main/java/seven/lab/wstun/ui/MainActivity.java create mode 100644 android/app/src/main/java/seven/lab/wstun/ui/ServiceAdapter.java create mode 100644 android/app/src/main/java/seven/lab/wstun/ui/StatusFragment.java create mode 100644 android/app/src/main/res/layout/activity_main.xml create mode 100644 android/app/src/main/res/layout/fragment_config.xml create mode 100644 android/app/src/main/res/layout/fragment_status.xml create mode 100644 android/app/src/main/res/layout/item_service.xml create mode 100644 android/app/src/main/res/values/colors.xml create mode 100644 android/app/src/main/res/values/strings.xml create mode 100644 android/app/src/main/res/values/themes.xml create mode 100644 android/app/src/main/res/xml/network_security_config.xml create mode 100644 android/build.gradle create mode 100644 android/settings.gradle diff --git a/README.md b/README.md index dd049d9..55ef80f 100755 --- a/README.md +++ b/README.md @@ -1,144 +1,18 @@ -# nodebase - - - -Running Node.js application over Wifi and share with your friends. - -For previous mature version, please explore source code on - kotlin branch and - v0flutter branch. - -## Rewrite Progress - -- [x] migrate kotlin service code -- [x] implement windows adapter for MethodChannel and EventChannel -- [x] rewrite new design UI in dart (basic flow) -- [ ] polish new design UI in dart -- [x] implement linux adapter -- [ ] implement macosx adapter -- [ ] implement web+ios adapter - -## How to use - -- make sure your device can connect to Internet - - choose application for downloading (e.g. file\_transfer-1.0.0) - - choose platform for downloading (e.g. node-v10.10.0) -- application - - click `play` button to start app via a wizard - -### Market Structure - -``` -/nodebase.json -{ - "version": "...", - "platform--": "...", ... - "platform-windows-x64": "e.g." -} - -/plm--.json -{ - "items": [ - "-", ... - "node-v10.10.0" - ] -} - -/app--.json -{ - "items": [ - "-", ... - "app-1.0.0:node" - ] -} - -/plm///-))>.json -{ - "name": "e.g. node", - "version": "e.g. v20.10.0", - "source": ", e.g. https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-x64.zip", - "executable": ["", "e.g. node-v20.11.0-win-x64\\node.exe"] -} - -/app///-))>.json -{ - "name": "e.g. file_transfer", - "version": "e.g. 1.0", - "source": ", e.g. https://raw.githubusercontent.com/wiki/dna2github/NodeBase/quick/app/node/file-transfer.zip", - "type": "web.server", - "argRequire": [{ "help": "folder path", "default": "." }], - "envRequire": [], - "entryPoint": ["index.js"] -} - -``` - -App examples: [https://github.com/nodebase0](https://github.com/nodebase0), includes file-viewer-uploader, nodepad, ... - - -## Development - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. - - -##### NodeJS/Python binary for ARM - -ref: https://github.com/dna2github/dna2oslab/releases/tag/0.2.0-android-gt6-arm - -##### Java binary - -write a shell script `java` and `adb push java /sdcard` -``` -#!/system/bin/sh - -exec dalvikvm $@ -``` - -create a new platform in NodeBase and download java wrapper from `file:///sdcard/java` - -then write a command line tool to have a try. ref: https://github.com/dna2github/dna2sevord/tree/master/past/others/walkserver/javacmd - -##### Golang binary - -``` -# download go source package and extract -cd src -GOOS=android GOARCH=arm64 ./bootstrap.bash - -tar zcf go-android-arm64-bootstrap.tar.gz go-android-arm64-bootstrap -adb push go-android-arm64-bootstrap.tar.gz /sdcard/ -# we suggest write a javascript script to set up golang environment on your Android -# to extract tar package to NodeBase app zone /data/user/0/net.seven.nodebase/ -# e.g. /data/user/0/net.seven.nodebase/go-android-arm64-bootstrap -``` - -write a shell script `go` and `adb push go /sdcard` - -``` -#!/system/bin/sh - -SELF=$(cd `dirname $0`; pwd) -BASE=/data/user/0/net.seven.nodebase/go-android-arm64-bootstrap -CACHEBASE=${BASE}/cache -mkdir -p ${CACHEBASE}/{cache,tmp,local} -export GOROOT=${BASE} -export GOPATH=${CACHEBASE}/golang/local -export GOCACHE=${CACHEBASE}/golang/cache -export GOTMPDIR=${CACHEBASE}/golang/tmp -export CGO_ENABLED=0 -exec ${BASE}/bin/go run $@ -``` - -create a new platform in NodeBase and download go wrapper from `file:///sdcard/go`; - -then write a tiny server to have a try. ref: https://github.com/stallpool/halfbase/blob/master/golang/tinyserver/main.go - +# NodeBase + + +Platform to Build Sharable Application for Android + +Running Websocket application over Wifi and share with your friends. + +- WSTun: it is a base server on http/websocket with netty; and project name is "WSTun" + +The design is changed, we never use a pre-built binary of NodeJS to run server anymore. + +We run a native http/websocket wit netty. + +Any JS client can register itself as a service so that it can be a control center of data. + +Others can connect as clients of the service and do more flexible things like file sharing, board gaming! + +It is also a project enjoy vibe coding! diff --git a/android/README.md b/android/README.md new file mode 100644 index 0000000..8f633da --- /dev/null +++ b/android/README.md @@ -0,0 +1,166 @@ +# WSTun - WebSocket Tunnel Server + +An Android app that runs an HTTP/WebSocket server for service sharing in local networks. + +## Features + +### Server (Android App) +- HTTP server with WebSocket support using Netty +- Optional HTTPS with self-signed certificate +- Service registration via WebSocket +- HTTP request relay to connected services +- Foreground service for background operation +- Service management UI (view, kick) + +### Services +- Connect via WebSocket and register endpoints +- Define HTTP routes that relay to the service +- Provide static resources (HTML/JS/CSS) +- No server-side storage - everything relayed + +## Architecture + +``` +┌─────────────┐ WebSocket ┌─────────────────┐ +│ Service │◄───────────────────►│ WSTun App │ +│ Client │ │ (HTTP Server) │ +└─────────────┘ └────────┬────────┘ + │ HTTP + ▼ + ┌─────────────────┐ + │ Web Browser │ + │ (User) │ + └─────────────────┘ +``` + +1. Service connects via WebSocket and registers +2. User accesses `http://server/[service]/main` +3. Server relays request to service via WebSocket +4. Service sends response via WebSocket +5. Server sends HTTP response to user + +## Building + +### Android App + +```bash +cd wstun +./gradlew assembleDebug +``` + +### Service Clients + +```bash +cd services/fileshare +npm install + +cd services/chat +npm install +``` + +## Usage + +### Start the Server + +1. Install the APK on an Android device +2. Configure port and HTTPS option +3. Tap "Start Server" +4. Note the displayed IP address + +### Connect Services + +```bash +# File sharing +cd services/fileshare +node client.js ws://192.168.1.100:8080/ws + +# Chat +cd services/chat +node client.js ws://192.168.1.100:8080/ws +``` + +### Access Services + +- Server info: `http://192.168.1.100:8080/` +- FileShare: `http://192.168.1.100:8080/fileshare/main` +- Chat: `http://192.168.1.100:8080/chat/main` + +## Protocol + +### Service Registration + +```json +{ + "type": "register", + "id": "unique-id", + "payload": { + "name": "servicename", + "type": "service-type", + "description": "Service description", + "endpoints": [ + { "path": "/main", "method": "GET", "relay": true } + ], + "static_resources": { + "/main": "..." + } + } +} +``` + +### HTTP Request Relay + +Server sends to service: +```json +{ + "type": "http_request", + "payload": { + "request_id": "req-123", + "method": "GET", + "path": "/servicename/main", + "headers": { "Content-Type": "text/html" }, + "body": "..." + } +} +``` + +Service responds: +```json +{ + "type": "http_response", + "payload": { + "request_id": "req-123", + "status": 200, + "headers": { "Content-Type": "text/html" }, + "body": "..." + } +} +``` + +## Included Services + +### FileShare + +Share files without server storage: +- Virtual folder tree +- File upload/download via browser +- Relay mode for temporary sharing +- All data flows through the client + +### Chat + +Real-time chat with rich messages: +- Text, Card, and Poll message types +- Broadcast to all or private messages +- Abstract JSON format for custom rendering +- Self-contained HTML/JS/CSS + +## Security Notes + +- HTTPS uses self-signed certificate (browser warning expected) +- No authentication built-in (add as needed) +- For local network use only +- Services should validate inputs + +## License + +MIT diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 0000000..d52bf27 --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,20 @@ +# Netty +-keepclassmembers class io.netty.** { *; } +-keep class io.netty.** { *; } +-dontwarn io.netty.** + +# Bouncy Castle +-keep class org.bouncycastle.** { *; } +-dontwarn org.bouncycastle.** + +# Gson +-keepattributes Signature +-keepattributes *Annotation* +-keep class com.google.gson.** { *; } +-keep class * implements java.io.Serializable { *; } + +# Protocol classes +-keep class seven.lab.wstun.protocol.** { *; } + +# Server classes +-keep class seven.lab.wstun.server.** { *; } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..aa6d6b2 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/assets/services/chat/index.html b/android/app/src/main/assets/services/chat/index.html new file mode 100644 index 0000000..21fcdbb --- /dev/null +++ b/android/app/src/main/assets/services/chat/index.html @@ -0,0 +1,590 @@ + + + + + + Chat - WSTun Service + + + +
+ +
+
+

WSTun Chat

+

Connect to a WSTun server to start chatting

+ + + +
+
+
+ + + +
+ + + + diff --git a/android/app/src/main/assets/services/fileshare/index.html b/android/app/src/main/assets/services/fileshare/index.html new file mode 100644 index 0000000..0bb77d8 --- /dev/null +++ b/android/app/src/main/assets/services/fileshare/index.html @@ -0,0 +1,574 @@ + + + + + + FileShare - WSTun Service + + + +
+ +
+
+

WSTun FileShare

+

Share files peer-to-peer via streaming relay

+ + +
+
+
+ + + +
+ + + + diff --git a/android/app/src/main/java/seven/lab/wstun/config/ServerConfig.java b/android/app/src/main/java/seven/lab/wstun/config/ServerConfig.java new file mode 100644 index 0000000..e045532 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/config/ServerConfig.java @@ -0,0 +1,93 @@ +package seven.lab.wstun.config; + +import android.content.Context; +import android.content.SharedPreferences; + +/** + * Server configuration stored in SharedPreferences. + */ +public class ServerConfig { + + private static final String PREFS_NAME = "wstun_config"; + private static final String KEY_PORT = "port"; + private static final String KEY_HTTPS_ENABLED = "https_enabled"; + private static final String KEY_CERT_GENERATED = "cert_generated"; + private static final String KEY_CORS_ORIGINS = "cors_origins"; + private static final String KEY_FILESHARE_ENABLED = "fileshare_enabled"; + private static final String KEY_CHAT_ENABLED = "chat_enabled"; + + private final SharedPreferences prefs; + + public ServerConfig(Context context) { + this.prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); + } + + public int getPort() { + return prefs.getInt(KEY_PORT, 8080); + } + + public void setPort(int port) { + prefs.edit().putInt(KEY_PORT, port).apply(); + } + + public boolean isHttpsEnabled() { + return prefs.getBoolean(KEY_HTTPS_ENABLED, false); + } + + public void setHttpsEnabled(boolean enabled) { + prefs.edit().putBoolean(KEY_HTTPS_ENABLED, enabled).apply(); + } + + public boolean isCertGenerated() { + return prefs.getBoolean(KEY_CERT_GENERATED, false); + } + + public void setCertGenerated(boolean generated) { + prefs.edit().putBoolean(KEY_CERT_GENERATED, generated).apply(); + } + + /** + * Get CORS allowed origins. Default is "*" (all origins). + * Can be comma-separated list of origins or "*". + */ + public String getCorsOrigins() { + return prefs.getString(KEY_CORS_ORIGINS, "*"); + } + + /** + * Set CORS allowed origins. + * Use "*" to allow all origins, or comma-separated list like: + * "http://localhost:3000,http://192.168.1.100:8080" + */ + public void setCorsOrigins(String origins) { + prefs.edit().putString(KEY_CORS_ORIGINS, origins).apply(); + } + + /** + * Check if FileShare service is enabled. + */ + public boolean isFileshareEnabled() { + return prefs.getBoolean(KEY_FILESHARE_ENABLED, false); + } + + /** + * Enable or disable FileShare service. + */ + public void setFileshareEnabled(boolean enabled) { + prefs.edit().putBoolean(KEY_FILESHARE_ENABLED, enabled).apply(); + } + + /** + * Check if Chat service is enabled. + */ + public boolean isChatEnabled() { + return prefs.getBoolean(KEY_CHAT_ENABLED, false); + } + + /** + * Enable or disable Chat service. + */ + public void setChatEnabled(boolean enabled) { + prefs.edit().putBoolean(KEY_CHAT_ENABLED, enabled).apply(); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayRequest.java b/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayRequest.java new file mode 100644 index 0000000..7197f2d --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayRequest.java @@ -0,0 +1,88 @@ +package seven.lab.wstun.protocol; + +import com.google.gson.annotations.SerializedName; + +import java.util.Map; + +/** + * HTTP request relayed to a service client. + */ +public class HttpRelayRequest { + + @SerializedName("request_id") + private String requestId; + + @SerializedName("method") + private String method; + + @SerializedName("path") + private String path; + + @SerializedName("query") + private String query; + + @SerializedName("headers") + private Map headers; + + @SerializedName("body") + private String body; + + @SerializedName("body_base64") + private String bodyBase64; // For binary data + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getQuery() { + return query; + } + + public void setQuery(String query) { + this.query = query; + } + + public Map getHeaders() { + return headers; + } + + public void setHeaders(Map headers) { + this.headers = headers; + } + + public String getBody() { + return body; + } + + public void setBody(String body) { + this.body = body; + } + + public String getBodyBase64() { + return bodyBase64; + } + + public void setBodyBase64(String bodyBase64) { + this.bodyBase64 = bodyBase64; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayResponse.java b/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayResponse.java new file mode 100644 index 0000000..8b18582 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/protocol/HttpRelayResponse.java @@ -0,0 +1,99 @@ +package seven.lab.wstun.protocol; + +import com.google.gson.annotations.SerializedName; + +import java.util.Map; + +/** + * HTTP response from a service client. + */ +public class HttpRelayResponse { + + @SerializedName("request_id") + private String requestId; + + @SerializedName("status") + private int status; + + @SerializedName("headers") + private Map headers; + + @SerializedName("body") + private String body; + + @SerializedName("body_base64") + private String bodyBase64; // For binary data + + @SerializedName("streaming") + private boolean streaming; + + @SerializedName("chunk_index") + private int chunkIndex; + + @SerializedName("is_final") + private boolean isFinal; + + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public Map getHeaders() { + return headers; + } + + public void setHeaders(Map headers) { + this.headers = headers; + } + + public String getBody() { + return body; + } + + public void setBody(String body) { + this.body = body; + } + + public String getBodyBase64() { + return bodyBase64; + } + + public void setBodyBase64(String bodyBase64) { + this.bodyBase64 = bodyBase64; + } + + public boolean isStreaming() { + return streaming; + } + + public void setStreaming(boolean streaming) { + this.streaming = streaming; + } + + public int getChunkIndex() { + return chunkIndex; + } + + public void setChunkIndex(int chunkIndex) { + this.chunkIndex = chunkIndex; + } + + public boolean isFinal() { + return isFinal; + } + + public void setFinal(boolean aFinal) { + isFinal = aFinal; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/protocol/Message.java b/android/app/src/main/java/seven/lab/wstun/protocol/Message.java new file mode 100644 index 0000000..11c6a3d --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/protocol/Message.java @@ -0,0 +1,128 @@ +package seven.lab.wstun.protocol; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.google.gson.annotations.SerializedName; + +/** + * Base message class for WebSocket communication. + * Supports both text (JSON) and binary modes. + */ +public class Message { + + private static final Gson gson = new Gson(); + + // Message types + public static final String TYPE_REGISTER = "register"; + public static final String TYPE_UNREGISTER = "unregister"; + public static final String TYPE_DATA = "data"; + public static final String TYPE_FILE_REQUEST = "file_request"; + public static final String TYPE_FILE_DATA = "file_data"; + public static final String TYPE_FILE_END = "file_end"; + public static final String TYPE_CHAT_MESSAGE = "chat_message"; + public static final String TYPE_CHAT_JOIN = "chat_join"; + public static final String TYPE_CHAT_LEAVE = "chat_leave"; + public static final String TYPE_ERROR = "error"; + public static final String TYPE_ACK = "ack"; + public static final String TYPE_RELAY_REGISTER = "relay_register"; + public static final String TYPE_RELAY_REQUEST = "relay_request"; + public static final String TYPE_HTTP_REQUEST = "http_request"; + public static final String TYPE_HTTP_RESPONSE = "http_response"; + + // Streaming response types for large file transfers + public static final String TYPE_HTTP_RESPONSE_START = "http_response_start"; + public static final String TYPE_HTTP_RESPONSE_CHUNK = "http_response_chunk"; + + // File registry types for relay file sharing + public static final String TYPE_FILE_REGISTER = "file_register"; + public static final String TYPE_FILE_UNREGISTER = "file_unregister"; + public static final String TYPE_FILE_LIST = "file_list"; + + @SerializedName("type") + private String type; + + @SerializedName("id") + private String id; + + @SerializedName("service") + private String service; + + @SerializedName("payload") + private JsonObject payload; + + @SerializedName("binary") + private boolean binary; + + public Message() { + } + + public Message(String type) { + this.type = type; + this.id = generateId(); + } + + public Message(String type, String service) { + this(type); + this.service = service; + } + + private String generateId() { + return String.valueOf(System.currentTimeMillis()) + "-" + (int)(Math.random() * 10000); + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getService() { + return service; + } + + public void setService(String service) { + this.service = service; + } + + public JsonObject getPayload() { + return payload; + } + + public void setPayload(JsonObject payload) { + this.payload = payload; + } + + public boolean isBinary() { + return binary; + } + + public void setBinary(boolean binary) { + this.binary = binary; + } + + public String toJson() { + return gson.toJson(this); + } + + public static Message fromJson(String json) { + return gson.fromJson(json, Message.class); + } + + public static T payloadAs(JsonObject payload, Class clazz) { + return gson.fromJson(payload, clazz); + } + + public static JsonObject toPayload(Object obj) { + return gson.toJsonTree(obj).getAsJsonObject(); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/protocol/ServiceRegistration.java b/android/app/src/main/java/seven/lab/wstun/protocol/ServiceRegistration.java new file mode 100644 index 0000000..a71b10b --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/protocol/ServiceRegistration.java @@ -0,0 +1,113 @@ +package seven.lab.wstun.protocol; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; +import java.util.Map; + +/** + * Service registration data sent by clients. + */ +public class ServiceRegistration { + + @SerializedName("name") + private String name; + + @SerializedName("type") + private String type; + + @SerializedName("description") + private String description; + + @SerializedName("endpoints") + private List endpoints; + + @SerializedName("static_resources") + private Map staticResources; // path -> content + + public static class Endpoint { + @SerializedName("path") + private String path; + + @SerializedName("method") + private String method; // GET, POST, etc. + + @SerializedName("description") + private String description; + + @SerializedName("relay") + private boolean relay; // Whether to relay requests to the client + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getMethod() { + return method; + } + + public void setMethod(String method) { + this.method = method; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public boolean isRelay() { + return relay; + } + + public void setRelay(boolean relay) { + this.relay = relay; + } + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public List getEndpoints() { + return endpoints; + } + + public void setEndpoints(List endpoints) { + this.endpoints = endpoints; + } + + public Map getStaticResources() { + return staticResources; + } + + public void setStaticResources(Map staticResources) { + this.staticResources = staticResources; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/HttpHandler.java b/android/app/src/main/java/seven/lab/wstun/server/HttpHandler.java new file mode 100644 index 0000000..3234c92 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/HttpHandler.java @@ -0,0 +1,762 @@ +package seven.lab.wstun.server; + +import android.util.Base64; +import android.util.Log; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; + +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.handler.codec.http.DefaultFullHttpResponse; +import io.netty.handler.codec.http.DefaultHttpResponse; +import io.netty.handler.codec.http.FullHttpRequest; +import io.netty.handler.codec.http.FullHttpResponse; +import io.netty.handler.codec.http.HttpHeaderNames; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.netty.handler.codec.http.HttpMethod; +import io.netty.handler.codec.http.HttpResponse; +import io.netty.handler.codec.http.HttpResponseStatus; +import io.netty.handler.codec.http.HttpUtil; +import io.netty.handler.codec.http.HttpVersion; +import io.netty.handler.codec.http.LastHttpContent; +import io.netty.handler.codec.http.QueryStringDecoder; +import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; +import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker; +import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory; +import seven.lab.wstun.protocol.HttpRelayRequest; +import seven.lab.wstun.protocol.HttpRelayResponse; +import seven.lab.wstun.protocol.Message; + +/** + * HTTP request handler that routes requests to registered services. + */ +public class HttpHandler extends SimpleChannelInboundHandler { + + private static final String TAG = "HttpHandler"; + private static final Gson gson = new Gson(); + + private final ServiceManager serviceManager; + private final RequestManager requestManager; + private final LocalServiceManager localServiceManager; + private final boolean ssl; + private final String corsOrigins; + private final int port; + + private WebSocketServerHandshaker handshaker; + + // Static reference for relay responses + private static String staticCorsOrigins = "*"; + + // Track channels with active streaming responses + private static final Map streamingResponses = new ConcurrentHashMap<>(); + + public HttpHandler(ServiceManager serviceManager, RequestManager requestManager, + LocalServiceManager localServiceManager, boolean ssl, String corsOrigins, int port) { + this.serviceManager = serviceManager; + this.requestManager = requestManager; + this.localServiceManager = localServiceManager; + this.ssl = ssl; + this.corsOrigins = corsOrigins != null ? corsOrigins : "*"; + this.port = port; + staticCorsOrigins = this.corsOrigins; + } + + public HttpHandler(ServiceManager serviceManager, RequestManager requestManager, boolean ssl) { + this(serviceManager, requestManager, null, ssl, "*", 8080); + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request) throws Exception { + // Check for WebSocket upgrade + if (isWebSocketUpgrade(request)) { + handleWebSocketUpgrade(ctx, request); + return; + } + + // Handle HTTP request + handleHttpRequest(ctx, request); + } + + private boolean isWebSocketUpgrade(FullHttpRequest request) { + String upgrade = request.headers().get(HttpHeaderNames.UPGRADE); + return "websocket".equalsIgnoreCase(upgrade); + } + + private void handleWebSocketUpgrade(ChannelHandlerContext ctx, FullHttpRequest request) { + String wsUrl = (ssl ? "wss" : "ws") + "://" + request.headers().get(HttpHeaderNames.HOST) + "/ws"; + + WebSocketServerHandshakerFactory wsFactory = new WebSocketServerHandshakerFactory( + wsUrl, null, true, 65536 + ); + + handshaker = wsFactory.newHandshaker(request); + if (handshaker == null) { + WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel()); + } else { + handshaker.handshake(ctx.channel(), request).addListener(future -> { + if (future.isSuccess()) { + // Replace this handler with WebSocket handler + ctx.pipeline().replace(this, "websocket", + new WebSocketHandler(serviceManager, requestManager)); + Log.i(TAG, "WebSocket connection established"); + } + }); + } + } + + private void handleHttpRequest(ChannelHandlerContext ctx, FullHttpRequest request) { + String uri = request.uri(); + QueryStringDecoder decoder = new QueryStringDecoder(uri); + String path = decoder.path(); + + Log.d(TAG, "HTTP " + request.method() + " " + path); + + // Handle CORS preflight + if (request.method() == HttpMethod.OPTIONS) { + sendCorsPreflightResponse(ctx, request); + return; + } + + // Root path - show server info + if ("/".equals(path)) { + sendServerInfo(ctx, request); + return; + } + + // Parse service name from path + String[] pathParts = path.split("/"); + if (pathParts.length < 2) { + sendNotFound(ctx, request); + return; + } + + String serviceName = pathParts[1]; + + // Check for local service endpoints (/fileshare/service or /chat/service) + if (localServiceManager != null && + ("fileshare".equals(serviceName) || "chat".equals(serviceName))) { + if (handleLocalService(ctx, request, serviceName, pathParts)) { + return; + } + } + + ServiceManager.ServiceEntry service = serviceManager.getService(serviceName); + + if (service == null) { + sendNotFound(ctx, request); + return; + } + + // Check for static resources + if (service.getRegistration().getStaticResources() != null) { + String resourcePath = path.substring(serviceName.length() + 1); + String content = service.getRegistration().getStaticResources().get(resourcePath); + if (content != null) { + sendStaticResource(ctx, request, content, resourcePath); + return; + } + } + + // Relay request to service client + relayRequest(ctx, request, service, path); + } + + private void relayRequest(ChannelHandlerContext ctx, FullHttpRequest request, + ServiceManager.ServiceEntry service, String path) { + // Create relay request + String requestId = String.valueOf(System.currentTimeMillis()) + "-" + (int)(Math.random() * 10000); + + HttpRelayRequest relayRequest = new HttpRelayRequest(); + relayRequest.setRequestId(requestId); + relayRequest.setMethod(request.method().name()); + relayRequest.setPath(path); + + QueryStringDecoder decoder = new QueryStringDecoder(request.uri()); + relayRequest.setQuery(request.uri().contains("?") ? + request.uri().substring(request.uri().indexOf("?") + 1) : ""); + + // Copy headers + Map headers = new HashMap<>(); + for (Map.Entry entry : request.headers()) { + headers.put(entry.getKey(), entry.getValue()); + } + relayRequest.setHeaders(headers); + + // Copy body + ByteBuf content = request.content(); + if (content.readableBytes() > 0) { + byte[] bodyBytes = new byte[content.readableBytes()]; + content.readBytes(bodyBytes); + + // Check if binary + String contentType = request.headers().get(HttpHeaderNames.CONTENT_TYPE); + if (contentType != null && isBinaryContentType(contentType)) { + relayRequest.setBodyBase64(Base64.encodeToString(bodyBytes, Base64.NO_WRAP)); + } else { + relayRequest.setBody(new String(bodyBytes, StandardCharsets.UTF_8)); + } + } + + // Store pending request + PendingRequest pending = new PendingRequest(requestId, ctx, request, service.getName()); + requestManager.addPendingRequest(pending); + + // Send to service via WebSocket + Message message = new Message(Message.TYPE_HTTP_REQUEST, service.getName()); + message.setPayload(Message.toPayload(relayRequest)); + + if (service.getChannel() != null && service.getChannel().isActive()) { + service.getChannel().writeAndFlush(new TextWebSocketFrame(message.toJson())); + } else { + requestManager.removePendingRequest(requestId); + sendServiceUnavailable(ctx, request); + } + } + + private boolean isBinaryContentType(String contentType) { + return contentType.startsWith("application/octet-stream") || + contentType.startsWith("image/") || + contentType.startsWith("audio/") || + contentType.startsWith("video/"); + } + + /** + * Send relay response to HTTP client. + */ + public static void sendRelayResponse(ChannelHandlerContext ctx, HttpRelayResponse response) { + HttpResponseStatus status = HttpResponseStatus.valueOf(response.getStatus()); + + byte[] body; + if (response.getBodyBase64() != null) { + body = Base64.decode(response.getBodyBase64(), Base64.NO_WRAP); + } else if (response.getBody() != null) { + body = response.getBody().getBytes(StandardCharsets.UTF_8); + } else { + body = new byte[0]; + } + + FullHttpResponse httpResponse = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + status, + Unpooled.wrappedBuffer(body) + ); + + // Add CORS headers using static method + addStaticCorsHeaders(httpResponse); + + // Copy headers + if (response.getHeaders() != null) { + for (Map.Entry entry : response.getHeaders().entrySet()) { + httpResponse.headers().set(entry.getKey(), entry.getValue()); + } + } + + httpResponse.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, body.length); + + ctx.writeAndFlush(httpResponse).addListener(ChannelFutureListener.CLOSE); + } + + /** + * Handle local service endpoints (/fileshare/service, /chat/service, etc.) + * Returns true if the request was handled. + */ + private boolean handleLocalService(ChannelHandlerContext ctx, FullHttpRequest request, + String serviceName, String[] pathParts) { + String subPath = pathParts.length > 2 ? pathParts[2] : ""; + + // Build server URL for generating links + String host = request.headers().get(HttpHeaderNames.HOST); + if (host == null) { + host = "localhost:" + port; + } + String protocol = ssl ? "https" : "http"; + String serverUrl = protocol + "://" + host; + + // /service - Service management page + if ("service".equals(subPath)) { + // Check for API endpoints under /service/api/* + if (pathParts.length > 3 && "api".equals(pathParts[3])) { + return handleLocalServiceApi(ctx, request, serviceName, pathParts); + } + + // Service management page + String html = localServiceManager.getServicePageHtml(serviceName, serverUrl); + sendHtmlResponse(ctx, request, html); + return true; + } + + // /main - Main service UI (only if service is running) + if ("main".equals(subPath)) { + LocalServiceManager.ServiceStatus status = localServiceManager.getServiceStatus(serviceName); + if (status == null || !status.isRunning()) { + sendServiceNotRunningResponse(ctx, request, serviceName, serverUrl); + return true; + } + + String html = localServiceManager.getServiceMainHtml(serviceName); + if (html != null) { + sendHtmlResponse(ctx, request, html); + return true; + } + } + + return false; + } + + /** + * Handle local service API endpoints. + */ + private boolean handleLocalServiceApi(ChannelHandlerContext ctx, FullHttpRequest request, + String serviceName, String[] pathParts) { + if (pathParts.length < 5) { + return false; + } + + String apiAction = pathParts[4]; + + // GET /service/api/status - Get service status + if ("status".equals(apiAction) && request.method() == HttpMethod.GET) { + LocalServiceManager.ServiceStatus status = localServiceManager.getServiceStatus(serviceName); + if (status != null) { + sendJsonResponse(ctx, request, status.toJson().toString()); + } else { + sendJsonResponse(ctx, request, "{\"error\": \"Service not found\"}"); + } + return true; + } + + // POST /service/api/start - Start service + if ("start".equals(apiAction) && request.method() == HttpMethod.POST) { + boolean success = localServiceManager.startService(serviceName); + LocalServiceManager.ServiceStatus status = localServiceManager.getServiceStatus(serviceName); + JsonObject response = new JsonObject(); + response.addProperty("success", success); + if (success && status != null) { + response.addProperty("uuid", status.getUuid()); + } else if (!success) { + response.addProperty("error", "Failed to start service"); + } + sendJsonResponse(ctx, request, response.toString()); + return true; + } + + // POST /service/api/stop - Stop service + if ("stop".equals(apiAction) && request.method() == HttpMethod.POST) { + // Parse request body for UUID + String uuid = null; + ByteBuf content = request.content(); + if (content.readableBytes() > 0) { + byte[] bodyBytes = new byte[content.readableBytes()]; + content.readBytes(bodyBytes); + try { + JsonObject body = gson.fromJson(new String(bodyBytes, StandardCharsets.UTF_8), JsonObject.class); + if (body.has("uuid")) { + uuid = body.get("uuid").getAsString(); + } + } catch (Exception e) { + // Ignore parse errors + } + } + + boolean success; + if (uuid != null) { + success = localServiceManager.stopServiceByUuid(serviceName, uuid); + } else { + success = localServiceManager.stopService(serviceName); + } + + JsonObject response = new JsonObject(); + response.addProperty("success", success); + if (!success) { + response.addProperty("error", "Failed to stop service (UUID mismatch or service not running)"); + } + sendJsonResponse(ctx, request, response.toString()); + return true; + } + + return false; + } + + /** + * Send response when service is not running. + */ + private void sendServiceNotRunningResponse(ChannelHandlerContext ctx, FullHttpRequest request, + String serviceName, String serverUrl) { + String displayName = "fileshare".equals(serviceName) ? "FileShare" : "Chat"; + String html = "\n" + + "\n" + + "" + displayName + " - Not Running\n" + + "\n" + + "

Service Not Running

\n" + + "

The " + displayName + " service is not currently running.

\n" + + "Start Service
"; + sendHtmlResponse(ctx, request, html); + } + + /** + * Send JSON response. + */ + private void sendJsonResponse(ChannelHandlerContext ctx, FullHttpRequest request, String json) { + byte[] bytes = json.getBytes(StandardCharsets.UTF_8); + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.OK, + Unpooled.wrappedBuffer(bytes) + ); + + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json; charset=UTF-8"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, bytes.length); + + sendResponse(ctx, request, response); + } + + private void sendServerInfo(ChannelHandlerContext ctx, FullHttpRequest request) { + StringBuilder html = new StringBuilder(); + html.append(""); + html.append(""); + html.append("WSTun Server"); + html.append(""); + html.append("
"); + html.append("

WSTun Server

"); + + // Built-in services section + if (localServiceManager != null) { + html.append("

Built-in Services

"); + html.append("
    "); + + // FileShare + if (localServiceManager.isServiceEnabled("fileshare")) { + LocalServiceManager.ServiceStatus fsStatus = localServiceManager.getServiceStatus("fileshare"); + html.append("
  • FileShare"); + if (fsStatus != null && fsStatus.isRunning()) { + html.append("Running"); + } else { + html.append("Stopped"); + } + html.append(" - Manage"); + if (fsStatus != null && fsStatus.isRunning()) { + html.append(" | Open"); + } + html.append("
    • "); + } else { + html.append("
  • FileShareDisabled
    • "); + } + + // Chat + if (localServiceManager.isServiceEnabled("chat")) { + LocalServiceManager.ServiceStatus chatStatus = localServiceManager.getServiceStatus("chat"); + html.append("
  • Chat"); + if (chatStatus != null && chatStatus.isRunning()) { + html.append("Running"); + } else { + html.append("Stopped"); + } + html.append(" - Manage"); + if (chatStatus != null && chatStatus.isRunning()) { + html.append(" | Open"); + } + html.append("
    • "); + } else { + html.append("
  • ChatDisabled
    • "); + } + + html.append("
"); + } + + html.append("

Registered Services

"); + + if (serviceManager.getServiceCount() == 0) { + html.append("

No services registered

"); + } else { + html.append("
    "); + for (ServiceManager.ServiceEntry service : serviceManager.getAllServices()) { + html.append("
  • ").append(service.getName()).append(""); + html.append(" (").append(service.getType()).append(")"); + html.append(" - ").append("/").append(service.getName()).append("/main"); + html.append("
    • "); + } + html.append("
"); + } + + html.append("
"); + + sendHtmlResponse(ctx, request, html.toString()); + } + + private void sendStaticResource(ChannelHandlerContext ctx, FullHttpRequest request, + String content, String path) { + String contentType = "text/plain"; + if (path.endsWith(".html")) { + contentType = "text/html; charset=UTF-8"; + } else if (path.endsWith(".js")) { + contentType = "application/javascript"; + } else if (path.endsWith(".css")) { + contentType = "text/css"; + } else if (path.endsWith(".json")) { + contentType = "application/json"; + } + + byte[] bytes = content.getBytes(StandardCharsets.UTF_8); + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.OK, + Unpooled.wrappedBuffer(bytes) + ); + + response.headers().set(HttpHeaderNames.CONTENT_TYPE, contentType); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, bytes.length); + + sendResponse(ctx, request, response); + } + + private void sendHtmlResponse(ChannelHandlerContext ctx, FullHttpRequest request, String html) { + byte[] bytes = html.getBytes(StandardCharsets.UTF_8); + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.OK, + Unpooled.wrappedBuffer(bytes) + ); + + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/html; charset=UTF-8"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, bytes.length); + + sendResponse(ctx, request, response); + } + + private void sendNotFound(ChannelHandlerContext ctx, FullHttpRequest request) { + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.NOT_FOUND, + Unpooled.copiedBuffer("Not Found".getBytes()) + ); + + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, 9); + + sendResponse(ctx, request, response); + } + + private void sendServiceUnavailable(ChannelHandlerContext ctx, FullHttpRequest request) { + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.SERVICE_UNAVAILABLE, + Unpooled.copiedBuffer("Service Unavailable".getBytes()) + ); + + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, 19); + + sendResponse(ctx, request, response); + } + + private void sendResponse(ChannelHandlerContext ctx, FullHttpRequest request, FullHttpResponse response) { + // Add CORS headers to all responses + addCorsHeaders(response); + + boolean keepAlive = HttpUtil.isKeepAlive(request); + + if (keepAlive) { + response.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE); + ctx.writeAndFlush(response); + } else { + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + } + + /** + * Add CORS headers to response. + */ + private void addCorsHeaders(FullHttpResponse response) { + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN, corsOrigins); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTIONS"); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_HEADERS, "Content-Type, Authorization, X-Requested-With"); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_MAX_AGE, "86400"); + } + + /** + * Add CORS headers with static origin (for relay responses). + */ + private static void addStaticCorsHeaders(FullHttpResponse response) { + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN, staticCorsOrigins); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTIONS"); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_HEADERS, "Content-Type, Authorization, X-Requested-With"); + } + + /** + * Handle CORS preflight (OPTIONS) requests. + */ + private void sendCorsPreflightResponse(ChannelHandlerContext ctx, FullHttpRequest request) { + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.OK, + Unpooled.EMPTY_BUFFER + ); + + addCorsHeaders(response); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, 0); + + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + Log.e(TAG, "HTTP handler error", cause); + ctx.close(); + } + + // ==================== Streaming Response Methods ==================== + + /** + * Start a streaming HTTP response (send headers, prepare for chunks). + */ + public static void startStreamingResponse(ChannelHandlerContext ctx, String requestId, + int status, JsonObject headers) { + HttpResponse response = new DefaultHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.valueOf(status) + ); + + // Add CORS headers + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_ORIGIN, staticCorsOrigins); + response.headers().set(HttpHeaderNames.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTIONS"); + + // Use chunked transfer encoding for streaming + response.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED); + + // Copy headers from payload + if (headers != null) { + for (String key : headers.keySet()) { + // Skip Content-Length as we're using chunked encoding + if (!key.equalsIgnoreCase("Content-Length")) { + response.headers().set(key, headers.get(key).getAsString()); + } + } + } + + ctx.write(response); + streamingResponses.put(requestId, ctx); + Log.d(TAG, "Started streaming response for: " + requestId); + } + + /** + * Send a chunk of streaming data. + */ + public static void sendStreamingChunk(ChannelHandlerContext ctx, String chunkBase64) { + if (ctx == null || !ctx.channel().isActive()) { + return; + } + + byte[] data = Base64.decode(chunkBase64, Base64.NO_WRAP); + ByteBuf buf = Unpooled.wrappedBuffer(data); + ctx.writeAndFlush(new io.netty.handler.codec.http.DefaultHttpContent(buf)); + } + + /** + * End a streaming response. + */ + public static void endStreamingResponse(ChannelHandlerContext ctx) { + if (ctx == null || !ctx.channel().isActive()) { + return; + } + + ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT) + .addListener(ChannelFutureListener.CLOSE); + Log.d(TAG, "Ended streaming response"); + } + + /** + * Send error and close streaming response. + */ + public static void sendStreamingError(ChannelHandlerContext ctx, String error) { + if (ctx == null || !ctx.channel().isActive()) { + return; + } + + // If headers not sent yet, send error response + byte[] errorBytes = error.getBytes(StandardCharsets.UTF_8); + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.INTERNAL_SERVER_ERROR, + Unpooled.wrappedBuffer(errorBytes) + ); + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, errorBytes.length); + addStaticCorsHeaders(response); + + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + + /** + * Request file stream from owner for relay download. + */ + public static void requestFileStream(ServiceManager serviceManager, String requestId, + String fileId, ChannelHandlerContext httpCtx) { + ServiceManager.FileInfo file = serviceManager.getFile(fileId); + if (file == null) { + sendNotFoundResponse(httpCtx); + return; + } + + Channel ownerChannel = file.getOwnerChannel(); + if (ownerChannel == null || !ownerChannel.isActive()) { + sendServiceUnavailableResponse(httpCtx); + return; + } + + // Send file request to owner + Message message = new Message(Message.TYPE_FILE_REQUEST); + JsonObject payload = new JsonObject(); + payload.addProperty("requestId", requestId); + payload.addProperty("fileId", fileId); + message.setPayload(payload); + + ownerChannel.writeAndFlush(new TextWebSocketFrame(message.toJson())); + Log.d(TAG, "Requested file stream from owner: " + fileId); + } + + private static void sendNotFoundResponse(ChannelHandlerContext ctx) { + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.NOT_FOUND, + Unpooled.copiedBuffer("File not found".getBytes()) + ); + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, 14); + addStaticCorsHeaders(response); + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + + private static void sendServiceUnavailableResponse(ChannelHandlerContext ctx) { + FullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.SERVICE_UNAVAILABLE, + Unpooled.copiedBuffer("File owner not connected".getBytes()) + ); + response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain"); + response.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, 24); + addStaticCorsHeaders(response); + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/LocalServiceManager.java b/android/app/src/main/java/seven/lab/wstun/server/LocalServiceManager.java new file mode 100644 index 0000000..3b6a9f6 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/LocalServiceManager.java @@ -0,0 +1,425 @@ +package seven.lab.wstun.server; + +import android.content.Context; +import android.util.Log; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import seven.lab.wstun.config.ServerConfig; + +/** + * Manages built-in local services (FileShare, Chat) that are hosted by the server itself. + * These services are loaded from assets and can be started/stopped via HTTP API. + */ +public class LocalServiceManager { + + private static final String TAG = "LocalServiceManager"; + private static final Gson gson = new Gson(); + + private final Context context; + private final ServerConfig config; + + // Service status tracking + private final Map serviceStatuses = new ConcurrentHashMap<>(); + + // HTML content cache + private String fileshareHtml; + private String chatHtml; + + /** + * Represents the status of a local service. + */ + public static class ServiceStatus { + private final String serviceName; + private String uuid; + private boolean running; + private long startedAt; + private long stoppedAt; + + public ServiceStatus(String serviceName) { + this.serviceName = serviceName; + this.running = false; + this.uuid = null; + } + + public void start() { + this.uuid = UUID.randomUUID().toString(); + this.running = true; + this.startedAt = System.currentTimeMillis(); + this.stoppedAt = 0; + } + + public void stop() { + this.running = false; + this.stoppedAt = System.currentTimeMillis(); + // Keep UUID so we can identify this was our service + } + + public String getServiceName() { return serviceName; } + public String getUuid() { return uuid; } + public boolean isRunning() { return running; } + public long getStartedAt() { return startedAt; } + public long getStoppedAt() { return stoppedAt; } + + public JsonObject toJson() { + JsonObject obj = new JsonObject(); + obj.addProperty("serviceName", serviceName); + obj.addProperty("uuid", uuid); + obj.addProperty("running", running); + obj.addProperty("startedAt", startedAt); + obj.addProperty("stoppedAt", stoppedAt); + return obj; + } + } + + public LocalServiceManager(Context context, ServerConfig config) { + this.context = context; + this.config = config; + + // Initialize service statuses + serviceStatuses.put("fileshare", new ServiceStatus("fileshare")); + serviceStatuses.put("chat", new ServiceStatus("chat")); + + // Load HTML content from assets + loadServiceHtml(); + } + + private void loadServiceHtml() { + try { + fileshareHtml = loadAsset("services/fileshare/index.html"); + chatHtml = loadAsset("services/chat/index.html"); + Log.i(TAG, "Loaded service HTML from assets"); + } catch (IOException e) { + Log.e(TAG, "Failed to load service HTML from assets", e); + // Use embedded HTML as fallback + fileshareHtml = getEmbeddedFileshareHtml(); + chatHtml = getEmbeddedChatHtml(); + } + } + + private String loadAsset(String path) throws IOException { + InputStream is = context.getAssets().open(path); + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + StringBuilder sb = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + sb.append(line).append("\n"); + } + reader.close(); + return sb.toString(); + } + + /** + * Check if a local service is enabled in config. + */ + public boolean isServiceEnabled(String serviceName) { + if ("fileshare".equals(serviceName)) { + return config.isFileshareEnabled(); + } else if ("chat".equals(serviceName)) { + return config.isChatEnabled(); + } + return false; + } + + /** + * Get service status. + */ + public ServiceStatus getServiceStatus(String serviceName) { + return serviceStatuses.get(serviceName); + } + + /** + * Start a local service. + */ + public boolean startService(String serviceName) { + if (!isServiceEnabled(serviceName)) { + Log.w(TAG, "Service not enabled: " + serviceName); + return false; + } + + ServiceStatus status = serviceStatuses.get(serviceName); + if (status == null) { + Log.w(TAG, "Unknown service: " + serviceName); + return false; + } + + if (status.isRunning()) { + Log.w(TAG, "Service already running: " + serviceName); + return false; + } + + status.start(); + Log.i(TAG, "Started local service: " + serviceName + " (UUID: " + status.getUuid() + ")"); + return true; + } + + /** + * Stop a local service. + */ + public boolean stopService(String serviceName) { + ServiceStatus status = serviceStatuses.get(serviceName); + if (status == null) { + Log.w(TAG, "Unknown service: " + serviceName); + return false; + } + + if (!status.isRunning()) { + Log.w(TAG, "Service not running: " + serviceName); + return false; + } + + status.stop(); + Log.i(TAG, "Stopped local service: " + serviceName); + return true; + } + + /** + * Stop a service by UUID (ensures it's exactly our service). + */ + public boolean stopServiceByUuid(String serviceName, String uuid) { + ServiceStatus status = serviceStatuses.get(serviceName); + if (status == null) { + return false; + } + + if (!uuid.equals(status.getUuid())) { + Log.w(TAG, "UUID mismatch for service: " + serviceName); + return false; + } + + return stopService(serviceName); + } + + /** + * Get the service management HTML page for a service. + */ + public String getServicePageHtml(String serviceName, String serverUrl) { + ServiceStatus status = serviceStatuses.get(serviceName); + if (status == null || !isServiceEnabled(serviceName)) { + return getServiceDisabledHtml(serviceName); + } + + return generateServicePageHtml(serviceName, serverUrl, status); + } + + /** + * Get the main service HTML (the actual fileshare/chat UI). + */ + public String getServiceMainHtml(String serviceName) { + if ("fileshare".equals(serviceName)) { + return fileshareHtml; + } else if ("chat".equals(serviceName)) { + return chatHtml; + } + return null; + } + + private String generateServicePageHtml(String serviceName, String serverUrl, ServiceStatus status) { + String displayName = "fileshare".equals(serviceName) ? "FileShare" : "Chat"; + String mainPath = "/" + serviceName + "/main"; + + return "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + " " + displayName + " Service - WSTun\n" + + " \n" + + "\n" + + "\n" + + "
\n" + + "
\n" + + "

" + displayName + " Service

\n" + + "

Manage the built-in " + displayName.toLowerCase() + " service

\n" + + " \n" + + "
\n" + + "
Loading...
\n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + " \n" + + " \n" + + " \n" + + "
\n" + + " \n" + + "
\n" + + " \n" + + "
\n" + + "

Service URL: " + serverUrl + mainPath + "

\n" + + "
\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "\n" + + ""; + } + + private String getServiceDisabledHtml(String serviceName) { + String displayName = "fileshare".equals(serviceName) ? "FileShare" : "Chat"; + return "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + " " + displayName + " Service - Disabled\n" + + " \n" + + "\n" + + "\n" + + "
\n" + + "

Service Disabled

\n" + + "

The " + displayName + " service is not enabled on this server.

\n" + + "

Enable it in the WSTun app configuration.

\n" + + "
\n" + + "\n" + + ""; + } + + // Fallback embedded HTML for FileShare + private String getEmbeddedFileshareHtml() { + return "FileShare

FileShare Service

Service HTML not loaded.

"; + } + + // Fallback embedded HTML for Chat + private String getEmbeddedChatHtml() { + return "Chat

Chat Service

Service HTML not loaded.

"; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/NettyServer.java b/android/app/src/main/java/seven/lab/wstun/server/NettyServer.java new file mode 100644 index 0000000..03ccd4c --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/NettyServer.java @@ -0,0 +1,167 @@ +package seven.lab.wstun.server; + +import android.content.Context; +import android.util.Log; + +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.SocketChannel; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.handler.codec.http.HttpObjectAggregator; +import io.netty.handler.codec.http.HttpServerCodec; +import io.netty.handler.ssl.SslContext; +import io.netty.handler.stream.ChunkedWriteHandler; +import io.netty.handler.timeout.IdleStateHandler; +import seven.lab.wstun.config.ServerConfig; + +/** + * Netty-based HTTP/WebSocket server with optional HTTPS support. + */ +public class NettyServer { + + private static final String TAG = "NettyServer"; + + private final Context context; + private final ServerConfig config; + private final ServiceManager serviceManager; + private final RequestManager requestManager; + private final LocalServiceManager localServiceManager; + + private EventLoopGroup bossGroup; + private EventLoopGroup workerGroup; + private Channel serverChannel; + private boolean running = false; + + public NettyServer(Context context, ServerConfig config, ServiceManager serviceManager) { + this.context = context; + this.config = config; + this.serviceManager = serviceManager; + this.requestManager = new RequestManager(); + this.localServiceManager = new LocalServiceManager(context, config); + + // Link ServiceManager to RequestManager for cleanup on disconnect + this.serviceManager.setRequestManager(this.requestManager); + } + + /** + * Start the server. + */ + public synchronized void start() throws Exception { + if (running) { + Log.w(TAG, "Server already running"); + return; + } + + int port = config.getPort(); + boolean ssl = config.isHttpsEnabled(); + + // Get SSL context if needed + SslContext sslContext = null; + if (ssl) { + sslContext = SslContextFactory.getSslContext(context); + } + final SslContext finalSslContext = sslContext; + final String corsOrigins = config.getCorsOrigins(); + final int serverPort = port; + final LocalServiceManager localSvcMgr = localServiceManager; + + bossGroup = new NioEventLoopGroup(1); + workerGroup = new NioEventLoopGroup(); + + ServerBootstrap bootstrap = new ServerBootstrap(); + bootstrap.group(bossGroup, workerGroup) + .channel(NioServerSocketChannel.class) + .option(ChannelOption.SO_BACKLOG, 128) + .childOption(ChannelOption.SO_KEEPALIVE, true) + .childHandler(new ChannelInitializer() { + @Override + protected void initChannel(SocketChannel ch) throws Exception { + ChannelPipeline pipeline = ch.pipeline(); + + // SSL handler + if (finalSslContext != null) { + pipeline.addLast("ssl", finalSslContext.newHandler(ch.alloc())); + } + + // HTTP codec + pipeline.addLast("http-codec", new HttpServerCodec()); + pipeline.addLast("http-aggregator", new HttpObjectAggregator(65536)); + pipeline.addLast("chunked-write", new ChunkedWriteHandler()); + + // Idle state handler + pipeline.addLast("idle", new IdleStateHandler(60, 30, 0)); + + // HTTP/WebSocket handler with CORS configuration and local service support + pipeline.addLast("http-handler", + new HttpHandler(serviceManager, requestManager, localSvcMgr, ssl, corsOrigins, serverPort)); + } + }); + + serverChannel = bootstrap.bind(port).sync().channel(); + running = true; + + Log.i(TAG, "Server started on port " + port + (ssl ? " (HTTPS)" : " (HTTP)")); + } + + /** + * Stop the server. + */ + public synchronized void stop() { + if (!running) { + return; + } + + running = false; + + // Close all service connections + serviceManager.clear(); + + // Shutdown request manager + requestManager.shutdown(); + + // Close server channel + if (serverChannel != null) { + try { + serverChannel.close().sync(); + } catch (InterruptedException e) { + Log.e(TAG, "Error closing server channel", e); + } + } + + // Shutdown event loops + if (workerGroup != null) { + workerGroup.shutdownGracefully(); + } + if (bossGroup != null) { + bossGroup.shutdownGracefully(); + } + + Log.i(TAG, "Server stopped"); + } + + /** + * Check if server is running. + */ + public boolean isRunning() { + return running; + } + + /** + * Get the service manager. + */ + public ServiceManager getServiceManager() { + return serviceManager; + } + + /** + * Get the request manager. + */ + public RequestManager getRequestManager() { + return requestManager; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/PendingRequest.java b/android/app/src/main/java/seven/lab/wstun/server/PendingRequest.java new file mode 100644 index 0000000..d0a7e96 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/PendingRequest.java @@ -0,0 +1,48 @@ +package seven.lab.wstun.server; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.http.HttpRequest; + +/** + * Represents a pending HTTP request waiting for response from a service client. + */ +public class PendingRequest { + + private final String requestId; + private final ChannelHandlerContext ctx; + private final HttpRequest request; + private final String serviceName; + private final long timestamp; + + public PendingRequest(String requestId, ChannelHandlerContext ctx, HttpRequest request, String serviceName) { + this.requestId = requestId; + this.ctx = ctx; + this.request = request; + this.serviceName = serviceName; + this.timestamp = System.currentTimeMillis(); + } + + public String getRequestId() { + return requestId; + } + + public ChannelHandlerContext getCtx() { + return ctx; + } + + public HttpRequest getRequest() { + return request; + } + + public String getServiceName() { + return serviceName; + } + + public long getTimestamp() { + return timestamp; + } + + public boolean isTimedOut(long timeoutMs) { + return System.currentTimeMillis() - timestamp > timeoutMs; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/RequestManager.java b/android/app/src/main/java/seven/lab/wstun/server/RequestManager.java new file mode 100644 index 0000000..c98a3ae --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/RequestManager.java @@ -0,0 +1,140 @@ +package seven.lab.wstun.server; + +import android.util.Log; + +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelFutureListener; +import io.netty.handler.codec.http.DefaultFullHttpResponse; +import io.netty.handler.codec.http.HttpResponseStatus; +import io.netty.handler.codec.http.HttpVersion; + +/** + * Manages pending HTTP requests that are being relayed to service clients. + */ +public class RequestManager { + + private static final String TAG = "RequestManager"; + private static final long REQUEST_TIMEOUT_MS = 30000; // 30 seconds + + private final Map pendingRequests = new ConcurrentHashMap<>(); + private final ScheduledExecutorService scheduler; + + public RequestManager() { + scheduler = Executors.newSingleThreadScheduledExecutor(); + scheduler.scheduleAtFixedRate(this::cleanupTimedOutRequests, 5, 5, TimeUnit.SECONDS); + } + + /** + * Register a pending request. + */ + public void addPendingRequest(PendingRequest request) { + pendingRequests.put(request.getRequestId(), request); + Log.d(TAG, "Added pending request: " + request.getRequestId()); + } + + /** + * Get and remove a pending request. + */ + public PendingRequest removePendingRequest(String requestId) { + PendingRequest request = pendingRequests.remove(requestId); + if (request != null) { + Log.d(TAG, "Removed pending request: " + requestId); + } + return request; + } + + /** + * Get a pending request without removing it. + */ + public PendingRequest getPendingRequest(String requestId) { + return pendingRequests.get(requestId); + } + + /** + * Fail all pending requests for a specific service (when service disconnects). + */ + public void failRequestsForService(String serviceName) { + Iterator> iterator = pendingRequests.entrySet().iterator(); + int count = 0; + + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + PendingRequest request = entry.getValue(); + + if (serviceName.equals(request.getServiceName())) { + iterator.remove(); + count++; + + // Send error response + if (request.getCtx().channel().isActive()) { + DefaultFullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.SERVICE_UNAVAILABLE, + Unpooled.copiedBuffer("Service disconnected".getBytes()) + ); + response.headers().set("Content-Type", "text/plain"); + response.headers().setInt("Content-Length", 20); + request.getCtx().writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + } + } + + if (count > 0) { + Log.w(TAG, "Failed " + count + " pending requests for disconnected service: " + serviceName); + } + } + + /** + * Clean up timed out requests. + */ + private void cleanupTimedOutRequests() { + Iterator> iterator = pendingRequests.entrySet().iterator(); + + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + PendingRequest request = entry.getValue(); + + if (request.isTimedOut(REQUEST_TIMEOUT_MS)) { + iterator.remove(); + Log.w(TAG, "Request timed out: " + request.getRequestId()); + + // Send timeout response + if (request.getCtx().channel().isActive()) { + DefaultFullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.GATEWAY_TIMEOUT, + Unpooled.copiedBuffer("Request timed out".getBytes()) + ); + request.getCtx().writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + } + } + } + + /** + * Shutdown the request manager. + */ + public void shutdown() { + scheduler.shutdown(); + + // Send error response to all pending requests + for (PendingRequest request : pendingRequests.values()) { + if (request.getCtx().channel().isActive()) { + DefaultFullHttpResponse response = new DefaultFullHttpResponse( + HttpVersion.HTTP_1_1, + HttpResponseStatus.SERVICE_UNAVAILABLE, + Unpooled.copiedBuffer("Server shutting down".getBytes()) + ); + request.getCtx().writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } + } + pendingRequests.clear(); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/ServiceManager.java b/android/app/src/main/java/seven/lab/wstun/server/ServiceManager.java new file mode 100644 index 0000000..381fb92 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/ServiceManager.java @@ -0,0 +1,357 @@ +package seven.lab.wstun.server; + +import android.util.Log; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import io.netty.channel.Channel; +import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; +import seven.lab.wstun.protocol.Message; +import seven.lab.wstun.protocol.ServiceRegistration; + +/** + * Manages registered services and their WebSocket connections. + */ +public class ServiceManager { + + private static final String TAG = "ServiceManager"; + + // Service name -> ServiceEntry + private final Map services = new ConcurrentHashMap<>(); + + // Channel -> Service name (for cleanup on disconnect) + private final Map channelToService = new ConcurrentHashMap<>(); + + // File registry: fileId -> FileInfo (for relay file sharing) + private final Map fileRegistry = new ConcurrentHashMap<>(); + + // Channel -> List of file IDs owned by that channel + private final Map> channelToFiles = new ConcurrentHashMap<>(); + + private ServiceChangeListener listener; + private RequestManager requestManager; + + /** + * Represents a file registered for relay sharing. + */ + public static class FileInfo { + private final String fileId; + private final String filename; + private final long size; + private final String mimeType; + private final String ownerId; + private final Channel ownerChannel; + + public FileInfo(String fileId, String filename, long size, String mimeType, + String ownerId, Channel ownerChannel) { + this.fileId = fileId; + this.filename = filename; + this.size = size; + this.mimeType = mimeType; + this.ownerId = ownerId; + this.ownerChannel = ownerChannel; + } + + public String getFileId() { return fileId; } + public String getFilename() { return filename; } + public long getSize() { return size; } + public String getMimeType() { return mimeType; } + public String getOwnerId() { return ownerId; } + public Channel getOwnerChannel() { return ownerChannel; } + + public JsonObject toJson() { + JsonObject obj = new JsonObject(); + obj.addProperty("id", fileId); + obj.addProperty("filename", filename); + obj.addProperty("size", size); + obj.addProperty("mimeType", mimeType); + obj.addProperty("ownerId", ownerId); + return obj; + } + } + + public interface ServiceChangeListener { + void onServiceAdded(ServiceEntry service); + void onServiceRemoved(ServiceEntry service); + } + + /** + * Represents a registered service. + */ + public static class ServiceEntry { + private final String name; + private final String type; + private final String description; + private final Channel channel; + private final ServiceRegistration registration; + private final long registeredAt; + + public ServiceEntry(ServiceRegistration registration, Channel channel) { + this.name = registration.getName(); + this.type = registration.getType(); + this.description = registration.getDescription(); + this.channel = channel; + this.registration = registration; + this.registeredAt = System.currentTimeMillis(); + } + + public String getName() { + return name; + } + + public String getType() { + return type; + } + + public String getDescription() { + return description; + } + + public Channel getChannel() { + return channel; + } + + public ServiceRegistration getRegistration() { + return registration; + } + + public long getRegisteredAt() { + return registeredAt; + } + + public boolean isConnected() { + return channel != null && channel.isActive(); + } + } + + public void setListener(ServiceChangeListener listener) { + this.listener = listener; + } + + public void setRequestManager(RequestManager requestManager) { + this.requestManager = requestManager; + } + + /** + * Register a new service. + */ + public boolean registerService(ServiceRegistration registration, Channel channel) { + String name = registration.getName(); + + if (name == null || name.isEmpty()) { + Log.w(TAG, "Service registration failed: no name provided"); + return false; + } + + // Check if service with same name exists + if (services.containsKey(name)) { + Log.w(TAG, "Service already exists: " + name); + return false; + } + + ServiceEntry entry = new ServiceEntry(registration, channel); + services.put(name, entry); + channelToService.put(channel, name); + + Log.i(TAG, "Service registered: " + name + " (type: " + registration.getType() + ")"); + + if (listener != null) { + listener.onServiceAdded(entry); + } + + return true; + } + + /** + * Unregister a service by name. + */ + public void unregisterService(String name) { + ServiceEntry entry = services.remove(name); + if (entry != null) { + channelToService.remove(entry.getChannel()); + Log.i(TAG, "Service unregistered: " + name); + + if (listener != null) { + listener.onServiceRemoved(entry); + } + } + } + + /** + * Handle channel disconnect - unregister associated service and clean up files. + */ + public void onChannelDisconnect(Channel channel) { + // Clean up files owned by this channel + cleanupFilesForChannel(channel); + + String serviceName = channelToService.remove(channel); + if (serviceName != null) { + ServiceEntry entry = services.remove(serviceName); + if (entry != null) { + Log.i(TAG, "Service disconnected: " + serviceName); + + // Fail any pending HTTP requests for this service + if (requestManager != null) { + requestManager.failRequestsForService(serviceName); + } + + if (listener != null) { + listener.onServiceRemoved(entry); + } + } + } + } + + /** + * Get a service by name. + */ + public ServiceEntry getService(String name) { + return services.get(name); + } + + /** + * Get all registered services. + */ + public List getAllServices() { + return new ArrayList<>(services.values()); + } + + /** + * Check if a service exists. + */ + public boolean hasService(String name) { + return services.containsKey(name); + } + + /** + * Get the number of registered services. + */ + public int getServiceCount() { + return services.size(); + } + + /** + * Kick (disconnect) a service. + */ + public void kickService(String name) { + ServiceEntry entry = services.get(name); + if (entry != null && entry.getChannel() != null) { + entry.getChannel().close(); + // The channel close will trigger onChannelDisconnect + } + } + + /** + * Clear all services. + */ + public void clear() { + for (ServiceEntry entry : services.values()) { + if (entry.getChannel() != null) { + entry.getChannel().close(); + } + } + services.clear(); + channelToService.clear(); + fileRegistry.clear(); + channelToFiles.clear(); + } + + // ==================== File Registry Methods ==================== + + /** + * Register a file for relay sharing. + */ + public void registerFile(String fileId, String filename, long size, String mimeType, + String ownerId, Channel ownerChannel) { + FileInfo info = new FileInfo(fileId, filename, size, mimeType, ownerId, ownerChannel); + fileRegistry.put(fileId, info); + + // Track files by channel for cleanup + channelToFiles.computeIfAbsent(ownerChannel, k -> new ArrayList<>()).add(fileId); + + Log.i(TAG, "File registered: " + filename + " (" + fileId + ") by " + ownerId); + + // Broadcast updated file list to all fileshare service clients + broadcastFileList(); + } + + /** + * Unregister a file from relay sharing. + */ + public void unregisterFile(String fileId) { + FileInfo info = fileRegistry.remove(fileId); + if (info != null) { + List files = channelToFiles.get(info.getOwnerChannel()); + if (files != null) { + files.remove(fileId); + } + Log.i(TAG, "File unregistered: " + info.getFilename() + " (" + fileId + ")"); + broadcastFileList(); + } + } + + /** + * Get file info by ID. + */ + public FileInfo getFile(String fileId) { + return fileRegistry.get(fileId); + } + + /** + * Get all registered files. + */ + public List getAllFiles() { + return new ArrayList<>(fileRegistry.values()); + } + + /** + * Handle channel disconnect - clean up files owned by this channel. + */ + private void cleanupFilesForChannel(Channel channel) { + List files = channelToFiles.remove(channel); + if (files != null && !files.isEmpty()) { + for (String fileId : files) { + fileRegistry.remove(fileId); + } + Log.i(TAG, "Cleaned up " + files.size() + " files for disconnected channel"); + broadcastFileList(); + } + } + + /** + * Broadcast updated file list to all connected fileshare clients. + */ + public void broadcastFileList() { + // Build file list JSON + JsonArray filesArray = new JsonArray(); + for (FileInfo file : fileRegistry.values()) { + filesArray.add(file.toJson()); + } + + Message message = new Message(Message.TYPE_FILE_LIST); + JsonObject payload = new JsonObject(); + payload.add("files", filesArray); + message.setPayload(payload); + + String json = message.toJson(); + + // Send to all fileshare service channels + ServiceEntry fileshare = services.get("fileshare"); + if (fileshare != null && fileshare.isConnected()) { + fileshare.getChannel().writeAndFlush(new TextWebSocketFrame(json)); + } + + // Also send to any other channels that have registered files + for (Channel channel : channelToFiles.keySet()) { + if (channel.isActive()) { + channel.writeAndFlush(new TextWebSocketFrame(json)); + } + } + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/SslContextFactory.java b/android/app/src/main/java/seven/lab/wstun/server/SslContextFactory.java new file mode 100644 index 0000000..5b71e5b --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/SslContextFactory.java @@ -0,0 +1,146 @@ +package seven.lab.wstun.server; + +import android.content.Context; +import android.util.Log; + +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cert.X509v3CertificateBuilder; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.math.BigInteger; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.KeyStore; +import java.security.Security; +import java.security.cert.X509Certificate; +import java.util.Date; + +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; + +import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.SslContextBuilder; + +/** + * Factory for creating SSL context with self-signed certificates. + */ +public class SslContextFactory { + + private static final String TAG = "SslContextFactory"; + private static final String KEYSTORE_FILE = "wstun.keystore"; + private static final String KEYSTORE_PASSWORD = "wstunpass"; + private static final String KEY_ALIAS = "wstun"; + + static { + Security.addProvider(new BouncyCastleProvider()); + } + + /** + * Get or create SSL context with self-signed certificate. + */ + public static SslContext getSslContext(Context context) throws Exception { + File keystoreFile = new File(context.getFilesDir(), KEYSTORE_FILE); + + KeyStore keyStore; + if (!keystoreFile.exists()) { + Log.i(TAG, "Generating new self-signed certificate"); + keyStore = generateSelfSignedCertificate(); + saveKeyStore(keyStore, keystoreFile); + } else { + Log.i(TAG, "Loading existing certificate"); + keyStore = loadKeyStore(keystoreFile); + } + + KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); + kmf.init(keyStore, KEYSTORE_PASSWORD.toCharArray()); + + return SslContextBuilder.forServer(kmf).build(); + } + + /** + * Generate a new self-signed certificate. + */ + private static KeyStore generateSelfSignedCertificate() throws Exception { + // Generate key pair + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("RSA"); + keyPairGen.initialize(2048); + KeyPair keyPair = keyPairGen.generateKeyPair(); + + // Certificate validity period + long now = System.currentTimeMillis(); + Date startDate = new Date(now); + Date endDate = new Date(now + 365L * 24 * 60 * 60 * 1000); // 1 year + + // Build certificate + X500Name issuer = new X500Name("CN=WSTun, O=WSTun, L=Local, C=US"); + BigInteger serial = BigInteger.valueOf(now); + + X509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder( + issuer, + serial, + startDate, + endDate, + issuer, + keyPair.getPublic() + ); + + ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA") + .setProvider("BC") + .build(keyPair.getPrivate()); + + X509CertificateHolder certHolder = certBuilder.build(signer); + X509Certificate cert = new JcaX509CertificateConverter() + .setProvider("BC") + .getCertificate(certHolder); + + // Create keystore + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + keyStore.load(null, null); + keyStore.setKeyEntry( + KEY_ALIAS, + keyPair.getPrivate(), + KEYSTORE_PASSWORD.toCharArray(), + new X509Certificate[]{cert} + ); + + return keyStore; + } + + /** + * Save keystore to file. + */ + private static void saveKeyStore(KeyStore keyStore, File file) throws Exception { + try (FileOutputStream fos = new FileOutputStream(file)) { + keyStore.store(fos, KEYSTORE_PASSWORD.toCharArray()); + } + } + + /** + * Load keystore from file. + */ + private static KeyStore loadKeyStore(File file) throws Exception { + KeyStore keyStore = KeyStore.getInstance("PKCS12"); + try (FileInputStream fis = new FileInputStream(file)) { + keyStore.load(fis, KEYSTORE_PASSWORD.toCharArray()); + } + return keyStore; + } + + /** + * Delete existing certificate to regenerate. + */ + public static void deleteCertificate(Context context) { + File keystoreFile = new File(context.getFilesDir(), KEYSTORE_FILE); + if (keystoreFile.exists()) { + keystoreFile.delete(); + } + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/server/WebSocketHandler.java b/android/app/src/main/java/seven/lab/wstun/server/WebSocketHandler.java new file mode 100644 index 0000000..21e0b92 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/server/WebSocketHandler.java @@ -0,0 +1,303 @@ +package seven.lab.wstun.server; + +import android.util.Log; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame; +import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame; +import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; +import io.netty.handler.codec.http.websocketx.PongWebSocketFrame; +import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; +import io.netty.handler.codec.http.websocketx.WebSocketFrame; +import seven.lab.wstun.protocol.HttpRelayResponse; +import seven.lab.wstun.protocol.Message; +import seven.lab.wstun.protocol.ServiceRegistration; + +/** + * Handler for WebSocket connections from service clients. + */ +public class WebSocketHandler extends SimpleChannelInboundHandler { + + private static final String TAG = "WebSocketHandler"; + private static final Gson gson = new Gson(); + + private final ServiceManager serviceManager; + private final RequestManager requestManager; + + public WebSocketHandler(ServiceManager serviceManager, RequestManager requestManager) { + this.serviceManager = serviceManager; + this.requestManager = requestManager; + } + + @Override + protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception { + if (frame instanceof TextWebSocketFrame) { + handleTextFrame(ctx, (TextWebSocketFrame) frame); + } else if (frame instanceof BinaryWebSocketFrame) { + handleBinaryFrame(ctx, (BinaryWebSocketFrame) frame); + } else if (frame instanceof PingWebSocketFrame) { + ctx.writeAndFlush(new PongWebSocketFrame(frame.content().retain())); + } else if (frame instanceof CloseWebSocketFrame) { + ctx.close(); + } + } + + private void handleTextFrame(ChannelHandlerContext ctx, TextWebSocketFrame frame) { + String text = frame.text(); + Log.d(TAG, "Received text: " + text); + + try { + Message message = Message.fromJson(text); + handleMessage(ctx, message); + } catch (Exception e) { + Log.e(TAG, "Failed to parse message", e); + sendError(ctx, "Invalid message format"); + } + } + + private void handleBinaryFrame(ChannelHandlerContext ctx, BinaryWebSocketFrame frame) { + ByteBuf content = frame.content(); + // Binary frames are used for file data streaming + // First byte is message type, rest is data + if (content.readableBytes() < 1) { + return; + } + + byte type = content.readByte(); + byte[] data = new byte[content.readableBytes()]; + content.readBytes(data); + + // Handle binary data based on type + Log.d(TAG, "Received binary frame, type: " + type + ", length: " + data.length); + } + + private void handleMessage(ChannelHandlerContext ctx, Message message) { + String type = message.getType(); + + switch (type) { + case Message.TYPE_REGISTER: + handleRegister(ctx, message); + break; + case Message.TYPE_UNREGISTER: + handleUnregister(ctx, message); + break; + case Message.TYPE_HTTP_RESPONSE: + handleHttpResponse(ctx, message); + break; + case Message.TYPE_HTTP_RESPONSE_START: + handleHttpResponseStart(ctx, message); + break; + case Message.TYPE_HTTP_RESPONSE_CHUNK: + handleHttpResponseChunk(ctx, message); + break; + case Message.TYPE_FILE_REGISTER: + handleFileRegister(ctx, message); + break; + case Message.TYPE_FILE_UNREGISTER: + handleFileUnregister(ctx, message); + break; + case Message.TYPE_DATA: + handleData(ctx, message); + break; + default: + Log.w(TAG, "Unknown message type: " + type); + } + } + + private void handleRegister(ChannelHandlerContext ctx, Message message) { + try { + ServiceRegistration registration = Message.payloadAs( + message.getPayload(), + ServiceRegistration.class + ); + + boolean success = serviceManager.registerService(registration, ctx.channel()); + + // Send acknowledgment + Message ack = new Message(Message.TYPE_ACK); + ack.setId(message.getId()); + JsonObject payload = new JsonObject(); + payload.addProperty("success", success); + payload.addProperty("message", success ? "Service registered" : "Registration failed"); + ack.setPayload(payload); + + ctx.writeAndFlush(new TextWebSocketFrame(ack.toJson())); + } catch (Exception e) { + Log.e(TAG, "Failed to register service", e); + sendError(ctx, "Registration failed: " + e.getMessage()); + } + } + + private void handleUnregister(ChannelHandlerContext ctx, Message message) { + String serviceName = message.getService(); + if (serviceName != null) { + serviceManager.unregisterService(serviceName); + } + + Message ack = new Message(Message.TYPE_ACK); + ack.setId(message.getId()); + ctx.writeAndFlush(new TextWebSocketFrame(ack.toJson())); + } + + private void handleHttpResponse(ChannelHandlerContext ctx, Message message) { + try { + HttpRelayResponse response = Message.payloadAs( + message.getPayload(), + HttpRelayResponse.class + ); + + PendingRequest pending = requestManager.removePendingRequest(response.getRequestId()); + if (pending != null) { + HttpHandler.sendRelayResponse(pending.getCtx(), response); + } else { + Log.w(TAG, "No pending request for: " + response.getRequestId()); + } + } catch (Exception e) { + Log.e(TAG, "Failed to handle HTTP response", e); + } + } + + private void handleData(ChannelHandlerContext ctx, Message message) { + // Handle service-specific data messages + String service = message.getService(); + if (service != null) { + ServiceManager.ServiceEntry entry = serviceManager.getService(service); + if (entry != null) { + // Broadcast or route data as needed + Log.d(TAG, "Data message for service: " + service); + } + } + } + + /** + * Handle streaming HTTP response start (headers). + */ + private void handleHttpResponseStart(ChannelHandlerContext ctx, Message message) { + try { + JsonObject payload = message.getPayload(); + String requestId = payload.get("request_id").getAsString(); + int status = payload.get("status").getAsInt(); + JsonObject headers = payload.getAsJsonObject("headers"); + + PendingRequest pending = requestManager.getPendingRequest(requestId); + if (pending != null) { + HttpHandler.startStreamingResponse(pending.getCtx(), requestId, status, headers); + } else { + Log.w(TAG, "No pending request for streaming start: " + requestId); + } + } catch (Exception e) { + Log.e(TAG, "Failed to handle HTTP response start", e); + } + } + + /** + * Handle streaming HTTP response chunk. + */ + private void handleHttpResponseChunk(ChannelHandlerContext ctx, Message message) { + try { + JsonObject payload = message.getPayload(); + String requestId = payload.get("request_id").getAsString(); + boolean done = payload.has("done") && payload.get("done").getAsBoolean(); + + String chunkBase64 = payload.has("chunk_base64") ? + payload.get("chunk_base64").getAsString() : null; + String error = payload.has("error") ? + payload.get("error").getAsString() : null; + + PendingRequest pending = done ? + requestManager.removePendingRequest(requestId) : + requestManager.getPendingRequest(requestId); + + if (pending != null) { + if (error != null) { + HttpHandler.sendStreamingError(pending.getCtx(), error); + } else if (chunkBase64 != null) { + HttpHandler.sendStreamingChunk(pending.getCtx(), chunkBase64); + } + + if (done) { + HttpHandler.endStreamingResponse(pending.getCtx()); + } + } else { + Log.w(TAG, "No pending request for streaming chunk: " + requestId); + } + } catch (Exception e) { + Log.e(TAG, "Failed to handle HTTP response chunk", e); + } + } + + /** + * Handle file registration for relay sharing. + */ + private void handleFileRegister(ChannelHandlerContext ctx, Message message) { + try { + JsonObject payload = message.getPayload(); + String fileId = payload.get("fileId").getAsString(); + String filename = payload.get("filename").getAsString(); + long size = payload.get("size").getAsLong(); + String mimeType = payload.has("mimeType") ? + payload.get("mimeType").getAsString() : "application/octet-stream"; + String ownerId = payload.has("ownerId") ? + payload.get("ownerId").getAsString() : "unknown"; + + serviceManager.registerFile(fileId, filename, size, mimeType, ownerId, ctx.channel()); + } catch (Exception e) { + Log.e(TAG, "Failed to register file", e); + } + } + + /** + * Handle file unregistration. + */ + private void handleFileUnregister(ChannelHandlerContext ctx, Message message) { + try { + JsonObject payload = message.getPayload(); + String fileId = payload.get("fileId").getAsString(); + serviceManager.unregisterFile(fileId); + } catch (Exception e) { + Log.e(TAG, "Failed to unregister file", e); + } + } + + private void sendError(ChannelHandlerContext ctx, String error) { + Message errorMsg = new Message(Message.TYPE_ERROR); + JsonObject payload = new JsonObject(); + payload.addProperty("error", error); + errorMsg.setPayload(payload); + ctx.writeAndFlush(new TextWebSocketFrame(errorMsg.toJson())); + } + + @Override + public void channelInactive(ChannelHandlerContext ctx) throws Exception { + Log.i(TAG, "WebSocket channel disconnected"); + + // Clean up any pending requests for this service + cleanupPendingRequestsForChannel(ctx); + + serviceManager.onChannelDisconnect(ctx.channel()); + super.channelInactive(ctx); + } + + /** + * Clean up pending HTTP requests when a service client disconnects. + * This sends error responses to HTTP clients waiting for relay responses. + */ + private void cleanupPendingRequestsForChannel(ChannelHandlerContext ctx) { + // Find and fail all pending requests that were being handled by this channel + // The RequestManager should have a method to get requests by service + // For now, we rely on the timeout mechanism, but we can improve this + Log.d(TAG, "Cleaning up pending requests for disconnected channel"); + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + Log.e(TAG, "WebSocket error", cause); + ctx.close(); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/service/WSTunService.java b/android/app/src/main/java/seven/lab/wstun/service/WSTunService.java new file mode 100644 index 0000000..8306c83 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/service/WSTunService.java @@ -0,0 +1,239 @@ +package seven.lab.wstun.service; + +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Intent; +import android.os.Binder; +import android.os.Build; +import android.os.IBinder; +import android.util.Log; + +import androidx.core.app.NotificationCompat; + +import seven.lab.wstun.R; +import seven.lab.wstun.config.ServerConfig; +import seven.lab.wstun.server.NettyServer; +import seven.lab.wstun.server.ServiceManager; +import seven.lab.wstun.ui.MainActivity; + +/** + * Foreground service that runs the HTTP/WebSocket server. + */ +public class WSTunService extends Service { + + private static final String TAG = "WSTunService"; + private static final String CHANNEL_ID = "wstun_service"; + private static final int NOTIFICATION_ID = 1; + + public static final String ACTION_START = "seven.lab.wstun.START"; + public static final String ACTION_STOP = "seven.lab.wstun.STOP"; + + private final IBinder binder = new LocalBinder(); + private NettyServer server; + private ServerConfig config; + private ServiceManager serviceManager; + private boolean isRunning = false; + + private ServiceListener listener; + + public interface ServiceListener { + void onServerStarted(); + void onServerStopped(); + void onServiceChanged(); + void onError(String message); + } + + public class LocalBinder extends Binder { + public WSTunService getService() { + return WSTunService.this; + } + } + + @Override + public void onCreate() { + super.onCreate(); + createNotificationChannel(); + config = new ServerConfig(this); + serviceManager = new ServiceManager(); + serviceManager.setListener(new ServiceManager.ServiceChangeListener() { + @Override + public void onServiceAdded(ServiceManager.ServiceEntry service) { + if (listener != null) { + listener.onServiceChanged(); + } + } + + @Override + public void onServiceRemoved(ServiceManager.ServiceEntry service) { + if (listener != null) { + listener.onServiceChanged(); + } + } + }); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (intent != null) { + String action = intent.getAction(); + if (ACTION_START.equals(action)) { + startServer(); + } else if (ACTION_STOP.equals(action)) { + stopServer(); + stopSelf(); + } + } + return START_STICKY; + } + + @Override + public IBinder onBind(Intent intent) { + return binder; + } + + @Override + public void onDestroy() { + stopServer(); + super.onDestroy(); + } + + /** + * Start the HTTP server. + */ + public void startServer() { + if (isRunning) { + Log.w(TAG, "Server already running"); + return; + } + + try { + server = new NettyServer(this, config, serviceManager); + server.start(); + isRunning = true; + + // Start foreground + startForeground(NOTIFICATION_ID, createNotification()); + + if (listener != null) { + listener.onServerStarted(); + } + + Log.i(TAG, "Server started on port " + config.getPort()); + } catch (Exception e) { + Log.e(TAG, "Failed to start server", e); + if (listener != null) { + listener.onError("Failed to start server: " + e.getMessage()); + } + } + } + + /** + * Stop the HTTP server. + */ + public void stopServer() { + if (!isRunning) { + return; + } + + if (server != null) { + server.stop(); + server = null; + } + + isRunning = false; + stopForeground(true); + + if (listener != null) { + listener.onServerStopped(); + } + + Log.i(TAG, "Server stopped"); + } + + /** + * Check if server is running. + */ + public boolean isServerRunning() { + return isRunning; + } + + /** + * Get server port. + */ + public int getPort() { + return config.getPort(); + } + + /** + * Check if HTTPS is enabled. + */ + public boolean isHttpsEnabled() { + return config.isHttpsEnabled(); + } + + /** + * Get service manager. + */ + public ServiceManager getServiceManager() { + return serviceManager; + } + + /** + * Set service listener. + */ + public void setListener(ServiceListener listener) { + this.listener = listener; + } + + /** + * Kick a service by name. + */ + public void kickService(String serviceName) { + if (serviceManager != null) { + serviceManager.kickService(serviceName); + } + } + + private void createNotificationChannel() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationChannel channel = new NotificationChannel( + CHANNEL_ID, + getString(R.string.notification_channel_name), + NotificationManager.IMPORTANCE_LOW + ); + channel.setDescription(getString(R.string.notification_channel_desc)); + + NotificationManager manager = getSystemService(NotificationManager.class); + if (manager != null) { + manager.createNotificationChannel(channel); + } + } + } + + private Notification createNotification() { + Intent intent = new Intent(this, MainActivity.class); + PendingIntent pendingIntent = PendingIntent.getActivity( + this, 0, intent, PendingIntent.FLAG_IMMUTABLE + ); + + Intent stopIntent = new Intent(this, WSTunService.class); + stopIntent.setAction(ACTION_STOP); + PendingIntent stopPendingIntent = PendingIntent.getService( + this, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE + ); + + String protocol = config.isHttpsEnabled() ? "HTTPS" : "HTTP"; + + return new NotificationCompat.Builder(this, CHANNEL_ID) + .setContentTitle(getString(R.string.notification_title)) + .setContentText(protocol + " server running on port " + config.getPort()) + .setSmallIcon(android.R.drawable.ic_menu_share) + .setContentIntent(pendingIntent) + .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Stop", stopPendingIntent) + .setOngoing(true) + .build(); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/ui/ConfigFragment.java b/android/app/src/main/java/seven/lab/wstun/ui/ConfigFragment.java new file mode 100644 index 0000000..863ccf0 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/ui/ConfigFragment.java @@ -0,0 +1,132 @@ +package seven.lab.wstun.ui; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.CheckBox; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.google.android.material.textfield.TextInputEditText; + +import seven.lab.wstun.R; +import seven.lab.wstun.config.ServerConfig; +import seven.lab.wstun.service.WSTunService; + +/** + * Fragment for server configuration. + */ +public class ConfigFragment extends Fragment { + + private WSTunService service; + private ServerConfig config; + + private TextInputEditText portInput; + private TextInputEditText corsOriginsInput; + private CheckBox httpsCheckbox; + private CheckBox fileshareCheckbox; + private CheckBox chatCheckbox; + private TextView certInfo; + private Button saveButton; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_config, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + config = new ServerConfig(requireContext()); + + portInput = view.findViewById(R.id.portInput); + corsOriginsInput = view.findViewById(R.id.corsOriginsInput); + httpsCheckbox = view.findViewById(R.id.httpsCheckbox); + fileshareCheckbox = view.findViewById(R.id.fileshareCheckbox); + chatCheckbox = view.findViewById(R.id.chatCheckbox); + certInfo = view.findViewById(R.id.certInfo); + saveButton = view.findViewById(R.id.saveButton); + + loadConfig(); + + httpsCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> { + certInfo.setVisibility(isChecked ? View.VISIBLE : View.GONE); + }); + + saveButton.setOnClickListener(v -> saveConfig()); + } + + public void onServiceConnected(WSTunService service) { + this.service = service; + updateUI(); + } + + private void loadConfig() { + portInput.setText(String.valueOf(config.getPort())); + httpsCheckbox.setChecked(config.isHttpsEnabled()); + certInfo.setVisibility(config.isHttpsEnabled() ? View.VISIBLE : View.GONE); + corsOriginsInput.setText(config.getCorsOrigins()); + fileshareCheckbox.setChecked(config.isFileshareEnabled()); + chatCheckbox.setChecked(config.isChatEnabled()); + } + + private void saveConfig() { + // Validate port + String portStr = portInput.getText().toString().trim(); + int port; + try { + port = Integer.parseInt(portStr); + if (port < 1 || port > 65535) { + Toast.makeText(getContext(), "Port must be between 1 and 65535", Toast.LENGTH_SHORT).show(); + return; + } + } catch (NumberFormatException e) { + Toast.makeText(getContext(), "Invalid port number", Toast.LENGTH_SHORT).show(); + return; + } + + // Check if server is running + if (service != null && service.isServerRunning()) { + Toast.makeText(getContext(), "Stop server before changing configuration", Toast.LENGTH_SHORT).show(); + return; + } + + // Validate CORS origins + String corsOrigins = corsOriginsInput.getText().toString().trim(); + if (corsOrigins.isEmpty()) { + corsOrigins = "*"; + } + + // Save config + config.setPort(port); + config.setHttpsEnabled(httpsCheckbox.isChecked()); + config.setCorsOrigins(corsOrigins); + config.setFileshareEnabled(fileshareCheckbox.isChecked()); + config.setChatEnabled(chatCheckbox.isChecked()); + + Toast.makeText(getContext(), "Configuration saved", Toast.LENGTH_SHORT).show(); + } + + private void updateUI() { + if (getActivity() == null || !isAdded()) return; + + requireActivity().runOnUiThread(() -> { + boolean canEdit = service == null || !service.isServerRunning(); + portInput.setEnabled(canEdit); + httpsCheckbox.setEnabled(canEdit); + corsOriginsInput.setEnabled(canEdit); + fileshareCheckbox.setEnabled(canEdit); + chatCheckbox.setEnabled(canEdit); + saveButton.setEnabled(canEdit); + }); + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/ui/MainActivity.java b/android/app/src/main/java/seven/lab/wstun/ui/MainActivity.java new file mode 100644 index 0000000..1f81e12 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/ui/MainActivity.java @@ -0,0 +1,141 @@ +package seven.lab.wstun.ui; + +import android.Manifest; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.content.pm.PackageManager; +import android.os.Build; +import android.os.Bundle; +import android.os.IBinder; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.viewpager2.adapter.FragmentStateAdapter; +import androidx.viewpager2.widget.ViewPager2; + +import com.google.android.material.tabs.TabLayout; +import com.google.android.material.tabs.TabLayoutMediator; + +import seven.lab.wstun.R; +import seven.lab.wstun.service.WSTunService; + +/** + * Main activity with tabs for status and configuration. + */ +public class MainActivity extends AppCompatActivity { + + private static final int PERMISSION_REQUEST_CODE = 100; + + private WSTunService service; + private boolean bound = false; + + private TabLayout tabLayout; + private ViewPager2 viewPager; + + private StatusFragment statusFragment; + private ConfigFragment configFragment; + + private final ServiceConnection connection = new ServiceConnection() { + @Override + public void onServiceConnected(ComponentName name, IBinder binder) { + WSTunService.LocalBinder localBinder = (WSTunService.LocalBinder) binder; + service = localBinder.getService(); + bound = true; + + // Notify fragments + if (statusFragment != null) { + statusFragment.onServiceConnected(service); + } + if (configFragment != null) { + configFragment.onServiceConnected(service); + } + } + + @Override + public void onServiceDisconnected(ComponentName name) { + bound = false; + service = null; + } + }; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + requestPermissions(); + initViews(); + bindService(); + } + + @Override + protected void onDestroy() { + if (bound) { + unbindService(connection); + bound = false; + } + super.onDestroy(); + } + + private void requestPermissions() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) + != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this, + new String[]{Manifest.permission.POST_NOTIFICATIONS}, + PERMISSION_REQUEST_CODE); + } + } + } + + private void initViews() { + tabLayout = findViewById(R.id.tabLayout); + viewPager = findViewById(R.id.viewPager); + + statusFragment = new StatusFragment(); + configFragment = new ConfigFragment(); + + viewPager.setAdapter(new FragmentStateAdapter(this) { + @NonNull + @Override + public Fragment createFragment(int position) { + if (position == 0) { + return statusFragment; + } else { + return configFragment; + } + } + + @Override + public int getItemCount() { + return 2; + } + }); + + new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> { + if (position == 0) { + tab.setText(R.string.tab_status); + } else { + tab.setText(R.string.tab_config); + } + }).attach(); + } + + private void bindService() { + Intent intent = new Intent(this, WSTunService.class); + bindService(intent, connection, Context.BIND_AUTO_CREATE); + } + + public WSTunService getWSTunService() { + return service; + } + + public boolean isServiceBound() { + return bound; + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/ui/ServiceAdapter.java b/android/app/src/main/java/seven/lab/wstun/ui/ServiceAdapter.java new file mode 100644 index 0000000..3c94506 --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/ui/ServiceAdapter.java @@ -0,0 +1,89 @@ +package seven.lab.wstun.ui; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import seven.lab.wstun.R; +import seven.lab.wstun.server.ServiceManager; + +/** + * RecyclerView adapter for displaying registered services. + */ +public class ServiceAdapter extends RecyclerView.Adapter { + + public interface KickCallback { + void onKick(ServiceManager.ServiceEntry service); + } + + private List services = new ArrayList<>(); + private final KickCallback callback; + private final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss", Locale.getDefault()); + + public ServiceAdapter(KickCallback callback) { + this.callback = callback; + } + + public void setServices(List services) { + this.services = new ArrayList<>(services); + notifyDataSetChanged(); + } + + @NonNull + @Override + public ServiceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.item_service, parent, false); + return new ServiceViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull ServiceViewHolder holder, int position) { + ServiceManager.ServiceEntry service = services.get(position); + holder.bind(service); + } + + @Override + public int getItemCount() { + return services.size(); + } + + class ServiceViewHolder extends RecyclerView.ViewHolder { + private final TextView serviceName; + private final TextView serviceType; + private final TextView serviceEndpoint; + private final Button kickButton; + + ServiceViewHolder(View itemView) { + super(itemView); + serviceName = itemView.findViewById(R.id.serviceName); + serviceType = itemView.findViewById(R.id.serviceType); + serviceEndpoint = itemView.findViewById(R.id.serviceEndpoint); + kickButton = itemView.findViewById(R.id.kickButton); + } + + void bind(ServiceManager.ServiceEntry service) { + serviceName.setText(service.getName()); + serviceType.setText(service.getType() + " - Connected at " + + dateFormat.format(new Date(service.getRegisteredAt()))); + serviceEndpoint.setText("/" + service.getName() + "/main"); + + kickButton.setOnClickListener(v -> { + if (callback != null) { + callback.onKick(service); + } + }); + } + } +} diff --git a/android/app/src/main/java/seven/lab/wstun/ui/StatusFragment.java b/android/app/src/main/java/seven/lab/wstun/ui/StatusFragment.java new file mode 100644 index 0000000..3df816d --- /dev/null +++ b/android/app/src/main/java/seven/lab/wstun/ui/StatusFragment.java @@ -0,0 +1,181 @@ +package seven.lab.wstun.ui; + +import android.content.Intent; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.Collections; +import java.util.List; + +import seven.lab.wstun.R; +import seven.lab.wstun.server.ServiceManager; +import seven.lab.wstun.service.WSTunService; + +/** + * Fragment showing server status and registered services. + */ +public class StatusFragment extends Fragment implements WSTunService.ServiceListener { + + private WSTunService service; + + private TextView statusText; + private TextView addressText; + private Button toggleButton; + private RecyclerView servicesRecyclerView; + private TextView emptyText; + + private ServiceAdapter adapter; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_status, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + statusText = view.findViewById(R.id.statusText); + addressText = view.findViewById(R.id.addressText); + toggleButton = view.findViewById(R.id.toggleButton); + servicesRecyclerView = view.findViewById(R.id.servicesRecyclerView); + emptyText = view.findViewById(R.id.emptyText); + + servicesRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + adapter = new ServiceAdapter(service -> { + if (this.service != null) { + this.service.kickService(service.getName()); + } + }); + servicesRecyclerView.setAdapter(adapter); + + toggleButton.setOnClickListener(v -> toggleServer()); + + updateUI(); + } + + public void onServiceConnected(WSTunService service) { + this.service = service; + service.setListener(this); + updateUI(); + } + + private void toggleServer() { + if (service == null) return; + + if (service.isServerRunning()) { + Intent intent = new Intent(getContext(), WSTunService.class); + intent.setAction(WSTunService.ACTION_STOP); + requireContext().startService(intent); + } else { + Intent intent = new Intent(getContext(), WSTunService.class); + intent.setAction(WSTunService.ACTION_START); + requireContext().startForegroundService(intent); + } + } + + private void updateUI() { + if (getActivity() == null || !isAdded()) return; + + requireActivity().runOnUiThread(() -> { + if (service != null && service.isServerRunning()) { + statusText.setText(R.string.server_running); + statusText.setTextColor(getResources().getColor(android.R.color.holo_green_dark)); + toggleButton.setText(R.string.stop_server); + + String protocol = service.isHttpsEnabled() ? "https" : "http"; + String ip = getLocalIpAddress(); + String address = protocol + "://" + ip + ":" + service.getPort(); + addressText.setText(address); + addressText.setVisibility(View.VISIBLE); + + updateServiceList(); + } else { + statusText.setText(R.string.server_stopped); + statusText.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + toggleButton.setText(R.string.start_server); + addressText.setVisibility(View.GONE); + + adapter.setServices(Collections.emptyList()); + emptyText.setVisibility(View.VISIBLE); + servicesRecyclerView.setVisibility(View.GONE); + } + }); + } + + private void updateServiceList() { + if (service == null || service.getServiceManager() == null) return; + + List services = service.getServiceManager().getAllServices(); + adapter.setServices(services); + + if (services.isEmpty()) { + emptyText.setVisibility(View.VISIBLE); + servicesRecyclerView.setVisibility(View.GONE); + } else { + emptyText.setVisibility(View.GONE); + servicesRecyclerView.setVisibility(View.VISIBLE); + } + } + + private String getLocalIpAddress() { + try { + List interfaces = Collections.list(NetworkInterface.getNetworkInterfaces()); + for (NetworkInterface intf : interfaces) { + List addrs = Collections.list(intf.getInetAddresses()); + for (InetAddress addr : addrs) { + if (!addr.isLoopbackAddress()) { + String sAddr = addr.getHostAddress(); + if (sAddr != null && !sAddr.contains(":")) { + return sAddr; + } + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return "localhost"; + } + + @Override + public void onServerStarted() { + updateUI(); + } + + @Override + public void onServerStopped() { + updateUI(); + } + + @Override + public void onServiceChanged() { + if (getActivity() != null) { + requireActivity().runOnUiThread(this::updateServiceList); + } + } + + @Override + public void onError(String message) { + if (getActivity() != null) { + requireActivity().runOnUiThread(() -> + Toast.makeText(getContext(), message, Toast.LENGTH_LONG).show() + ); + } + } +} diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..ee0e042 --- /dev/null +++ b/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/android/app/src/main/res/layout/fragment_config.xml b/android/app/src/main/res/layout/fragment_config.xml new file mode 100644 index 0000000..224fe29 --- /dev/null +++ b/android/app/src/main/res/layout/fragment_config.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+
+
+

Chat

+

Create a chat room

+ +
+ + +
+
+ +
+
+ + +
+ + + +
- - -