Change app name

- make the refresh interval setting makes effect immediately.
- auto stop/restart status update when app goto background/resume

.vscode/launch.json

@@ -13,7 +13,11 @@
             "name": "toolbox (profile mode)",
             "request": "launch",
             "type": "dart",
-            "flutterMode": "profile"
+            "flutterMode": "profile",
+            "args": [
+                "--cache-sksl",
+                // "--purge-persistent-cache"
+            ]
         }
     ]
 }

README.md

@@ -30,16 +30,23 @@ A new Flutter project which provide a chart view to display server status data.
   </tr>
 </table>
 
+# Support
+Status|Platform 
+--|--|
+Full Support|Android/iOS/macOS
+Support, but not tested|Windows/Linux
+
 ## Milestone
-- [x] SSH Connect
+- [x] SSH connect
-- [x] Server Info Store
+- [x] Server info store
-- [x] Status Chart View
+- [x] Status chart view
 - [x] Base64/Url En/Decode
-- [x] Private Key Store
+- [x] Private key store
-- [x] Server Status Detail Page
+- [x] Server status detail page
-- [x] Theme Switch
+- [x] Theme switch
-- [ ] Execute Snippet
+- [x] Execute snippet
-- [ ] Migrate from `ssh2` to `dartssh2`
+- [x] Migrate from `ssh2` to `dartssh2`
+- [x] Desktop support
 
 ## Build
 Please use `make.dart` to build.

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="tech.lolli.toolbox">
-   <application
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application
         android:label="ServerBox"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="true"
+        android:hasFragileUserData="true"
+        android:restoreAnyVersion="true">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"

ios/Podfile.lock

@@ -2,45 +2,38 @@ PODS:
   - countly_flutter (20.11.4):
     - Flutter
   - Flutter (1.0.0)
-  - GZ-NMSSH (4.1.5)
+  - path_provider_ios (0.0.1):
-  - path_provider (0.0.1):
     - Flutter
-  - ssh2 (2.2.3):
+  - r_upgrade (0.0.1):
     - Flutter
-    - GZ-NMSSH (~> 4.1.5)
+  - url_launcher_ios (0.0.1):
-  - url_launcher (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - countly_flutter (from `.symlinks/plugins/countly_flutter/ios`)
   - Flutter (from `Flutter`)
-  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
-  - ssh2 (from `.symlinks/plugins/ssh2/ios`)
+  - r_upgrade (from `.symlinks/plugins/r_upgrade/ios`)
-  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-
-SPEC REPOS:
-  trunk:
-    - GZ-NMSSH
 
 EXTERNAL SOURCES:
   countly_flutter:
     :path: ".symlinks/plugins/countly_flutter/ios"
   Flutter:
     :path: Flutter
-  path_provider:
+  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider/ios"
+    :path: ".symlinks/plugins/path_provider_ios/ios"
-  ssh2:
+  r_upgrade:
-    :path: ".symlinks/plugins/ssh2/ios"
+    :path: ".symlinks/plugins/r_upgrade/ios"
-  url_launcher:
+  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher/ios"
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   countly_flutter: 38419412e193a1faa5babeb5d28a63fda260687d
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  GZ-NMSSH: d749f8ae2fd0094b953cd1d5abd8e0cab3c93f8d
+  path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
-  path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
+  r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114
-  ssh2: 74165efc99417a075ecafd52caf93edadfb5eb60
+  url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
-  url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 

ios/Runner.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -362,7 +362,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.toolbox;
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -483,7 +484,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -491,7 +492,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.toolbox;
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -506,7 +508,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -514,7 +516,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.toolbox;
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
+<dict>
-		<key>CFBundleDevelopmentRegion</key>
+	<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleExecutable</key>
+	<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
+	<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
+	<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
+	<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
+	<string>6.0</string>
-		<key>CFBundleName</key>
+	<key>CFBundleName</key>
-		<string>toolbox</string>
+	<string>ServerBox</string>
-		<key>CFBundlePackageType</key>
+	<key>CFBundlePackageType</key>
-		<string>APPL</string>
+	<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
+	<key>CFBundleShortVersionString</key>
-		<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
-		<key>CFBundleSignature</key>
+	<key>CFBundleSignature</key>
-		<string>????</string>
+	<string>????</string>
-		<key>CFBundleVersion</key>
+	<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
-		<key>LSRequiresIPhoneOS</key>
+	<key>LSRequiresIPhoneOS</key>
-		<true/>
+	<true/>
-		<key>UILaunchStoryboardName</key>
+	<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
+	<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
+	<key>UIMainStoryboardFile</key>
-		<string>Main</string>
+	<string>Main</string>
-		<key>UISupportedInterfaceOrientations</key>
+	<key>UIStatusBarHidden</key>
-		<array>
+	<false/>
-			<string>UIInterfaceOrientationPortrait</string>
+	<key>UISupportedInterfaceOrientations</key>
-		</array>
+	<array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
+		<string>UIInterfaceOrientationPortrait</string>
-		<array>
+	</array>
-			<string>UIInterfaceOrientationPortrait</string>
+	<key>UISupportedInterfaceOrientations~ipad</key>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	<array>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		</array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<string>UIInterfaceOrientationLandscapeRight</string>
-		<false/>
+	</array>
-		<key>UIStatusBarHidden</key>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false/>
+	<false/>
-	</dict>
+</dict>
-</plist>
+</plist>

lib/app.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:toolbox/data/res/build_data.dart';
 import 'package:toolbox/data/store/setting.dart';
 import 'package:toolbox/locator.dart';
 import 'package:toolbox/view/page/home.dart';
@@ -21,7 +22,6 @@ class MyApp extends StatelessWidget {
     });
   }
 
-  // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder<int>(
@@ -30,7 +30,8 @@ class MyApp extends StatelessWidget {
           final primaryColor = Color(value);
           final textStyle = TextStyle(color: primaryColor);
           return MaterialApp(
-            title: 'ToolBox',
+            title: BuildData.name,
+            debugShowCheckedModeBanner: false,
             theme: ThemeData(
               primaryColor: primaryColor,
               appBarTheme: AppBarTheme(backgroundColor: primaryColor),

lib/core/analysis.dart

@@ -6,7 +6,10 @@ class Analysis {
   static const _url = 'https://countly.xuty.cc';
   static const _key = '80372a2a66424b32d0ac8991bfa1ef058bd36b1f';
 
+  static bool _enabled = false;
+
   static Future<void> init(bool debug) async {
+    _enabled = true;
     await Countly.setLoggingEnabled(debug);
     await Countly.init(_url, _key);
     await Countly.start();
@@ -15,10 +18,14 @@ class Analysis {
   }
 
   static void recordView(String view) {
-    Countly.recordView(view);
+    if (_enabled) {
+      Countly.recordView(view);
+    }
   }
 
   static void recordException(Object exception, [bool fatal = false]) {
-    Countly.logException(exception.toString(), !fatal, null);
+    if (_enabled) {
+      Countly.logException(exception.toString(), !fatal, null);
+    }
   }
 }

lib/core/update.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:r_upgrade/r_upgrade.dart';
 import 'package:toolbox/core/utils.dart';
 import 'package:toolbox/data/provider/app.dart';
 import 'package:toolbox/data/res/build_data.dart';
@@ -39,8 +40,16 @@ Future<void> doUpdate(BuildContext context, {bool force = false}) async {
   showSnackBarWithAction(
       context,
       update.min > BuildData.build
-          ? '您的版本过旧，请及时更新'
+          ? 'Your version is too old. \nPlease update to v1.0.${update.newest}.'
-          : '${BuildData.name}有更新啦，Ver：${update.newest}\n${update.changelog}',
+          : 'Update: v1.0.${update.newest} available. \n${update.changelog}',
-      '更新',
+      'Update', () async {
-      () => openUrl(Platform.isAndroid ? update.android : update.ios));
+    if (Platform.isAndroid) {
+      await RUpgrade.upgrade(update.android,
+          fileName: update.android.split('/').last, isAutoRequestInstall: true);
+    } else if (Platform.isIOS) {
+      await RUpgrade.upgradeFromAppStore('1586449703');
+    } else if (Platform.isMacOS) {
+      await RUpgrade.upgradeFromUrl(update.mac);
+    }
+  });
 }

lib/core/utils.dart

@@ -15,13 +15,13 @@ bool isDarkMode(BuildContext context) =>
 void showSnackBar(BuildContext context, Widget child) =>
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: child));
 
-void showSnackBarWithAction(
+void showSnackBarWithAction(BuildContext context, String content, String action,
-    BuildContext context, String content, String action, Function onTap) {
+    GestureTapCallback onTap) {
   ScaffoldMessenger.of(context).showSnackBar(SnackBar(
     content: Text(content),
     action: SnackBarAction(
       label: action,
-      onPressed: () => onTap,
+      onPressed: onTap,
     ),
   ));
 }

lib/data/model/app/update.dart

@@ -13,8 +13,12 @@ class AppUpdate {
 */
 
   late int newest;
+  late int iosbuild;
+  late int androidbuild;
+  late int macbuild;
   late String android;
   late String ios;
+  late String mac;
   late int min;
   late String changelog;
 
@@ -27,6 +31,9 @@ class AppUpdate {
   });
   AppUpdate.fromJson(Map<String, dynamic> json) {
     newest = json["newest"]?.toInt();
+    newest = json["macbuild"]?.toInt();
+    newest = json["iosbuild"]?.toInt();
+    newest = json["androidbuild"]?.toInt();
     android = json["android"].toString();
     ios = json["ios"].toString();
     min = json["min"].toInt();
@@ -35,6 +42,9 @@ class AppUpdate {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = <String, dynamic>{};
     data["newest"] = newest;
+    data["macbuild"] = macbuild;
+    data["iosbuild"] = iosbuild;
+    data["androidbuild"] = androidbuild;
     data["android"] = android;
     data["ios"] = ios;
     data["min"] = min;

lib/data/model/server/memory.dart

@@ -5,5 +5,11 @@ class Memory {
   int shared;
   int cache;
   int avail;
-  Memory({required this.total, required this.used, required this.free, required this.shared, required this.cache, required this.avail});
+  Memory(
+      {required this.total,
+      required this.used,
+      required this.free,
+      required this.shared,
+      required this.cache,
+      required this.avail});
 }

lib/data/model/server/server.dart

@@ -1,4 +1,4 @@
-import 'package:ssh2/ssh2.dart';
+import 'package:dartssh2/dartssh2.dart';
 import 'package:toolbox/data/model/server/server_connection_state.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/server_status.dart';
@@ -6,7 +6,7 @@ import 'package:toolbox/data/model/server/server_status.dart';
 class ServerInfo {
   ServerPrivateInfo info;
   ServerStatus status;
-  SSHClient client;
+  SSHClient? client;
   ServerConnectionState connectionState;
 
   ServerInfo(this.info, this.status, this.client, this.connectionState);

lib/data/model/server/server_status.dart

@@ -37,7 +37,9 @@ class ServerStatus {
   List<DiskInfo> disk;
   TcpStatus tcp;
   NetSpeed netSpeed;
+  String? failedInfo;
 
   ServerStatus(this.cpu2Status, this.memory, this.sysVer, this.uptime,
-      this.disk, this.tcp, this.netSpeed);
+      this.disk, this.tcp, this.netSpeed,
+      {this.failedInfo});
 }

lib/data/provider/server.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
+import 'dart:convert';
 
+import 'package:dartssh2/dartssh2.dart';
+import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
-import 'package:ssh2/ssh2.dart';
 import 'package:toolbox/core/extension/stringx.dart';
 import 'package:toolbox/core/provider_base.dart';
 import 'package:toolbox/data/model/server/cpu_2_status.dart';
@@ -13,15 +15,30 @@ import 'package:toolbox/data/model/server/disk_info.dart';
 import 'package:toolbox/data/model/server/server.dart';
 import 'package:toolbox/data/model/server/server_private_info.dart';
 import 'package:toolbox/data/model/server/server_status.dart';
+import 'package:toolbox/data/model/server/snippet.dart';
 import 'package:toolbox/data/model/server/tcp_status.dart';
+import 'package:toolbox/data/store/private_key.dart';
 import 'package:toolbox/data/store/server.dart';
 import 'package:toolbox/data/store/setting.dart';
 import 'package:toolbox/locator.dart';
 
+/// Must put this func out of any Class.
+/// Because of this function is called by [compute] in [ServerProvider.genClient].
+/// https://stackoverflow.com/questions/51998995/invalid-arguments-illegal-argument-in-isolate-message-object-is-a-closure
+List<SSHKeyPair> loadIndentity(String key) {
+  final watch = Stopwatch()..start();
+  final pem = SSHKeyPair.fromPem(key);
+  watch.stop();
+  print('loadIndentity: ${watch.elapsedMilliseconds}ms');
+  return pem;
+}
+
 class ServerProvider extends BusyProvider {
   List<ServerInfo> _servers = [];
   List<ServerInfo> get servers => _servers;
 
+  Timer? _timer;
+
   final logger = Logger('ServerProvider');
 
   Memory get emptyMemory =>
@@ -56,37 +73,37 @@ class ServerProvider extends BusyProvider {
 
   ServerInfo genInfo(ServerPrivateInfo spi) {
     return ServerInfo(
-        spi, emptyStatus, genClient(spi), ServerConnectionState.disconnected);
+        spi, emptyStatus, null, ServerConnectionState.disconnected);
   }
 
-  SSHClient genClient(ServerPrivateInfo spi) {
+  Future<SSHClient> genClient(ServerPrivateInfo spi) async {
-    return SSHClient(
+    final socket = await SSHSocket.connect(spi.ip, spi.port);
-        host: spi.ip,
+    if (spi.pubKeyId == null) {
-        port: spi.port,
+      return SSHClient(socket,
+          username: spi.user,
+          onPasswordRequest: () => spi.authorization as String);
+    }
+    final key = locator<PrivateKeyStore>().get(spi.pubKeyId!);
+    return SSHClient(socket,
         username: spi.user,
-        passwordOrKey: spi.authorization);
+        identities: await compute(loadIndentity, key.privateKey));
   }
 
   Future<void> refreshData({int? idx}) async {
     if (idx != null) {
-      final singleData = await _getData(_servers[idx].info, idx);
+      _getData(idx);
-      if (singleData != null) {
-        _servers[idx].status = singleData;
-        notifyListeners();
-      }
       return;
     }
     try {
       await Future.wait(_servers.map((s) async {
         final idx = _servers.indexOf(s);
-        final status = await _getData(s.info, idx);
+        if (idx == -1) return;
-        if (status != null) {
+        await _getData(idx);
-          _servers[idx].status = status;
-          notifyListeners();
-        }
       }));
     } catch (e) {
-      rethrow;
+      if (e is! RangeError) {
+        rethrow;
+      }
     }
   }
 
@@ -94,11 +111,19 @@ class ServerProvider extends BusyProvider {
     final duration =
         locator<SettingStore>().serverStatusUpdateInterval.fetch()!;
     if (duration == 0) return;
-    Timer.periodic(Duration(seconds: duration), (_) async {
+    stopAutoRefresh();
+    _timer = Timer.periodic(Duration(seconds: duration), (_) async {
       await refreshData();
     });
   }
 
+  void stopAutoRefresh() {
+    if (_timer != null) {
+      _timer!.cancel();
+      _timer = null;
+    }
+  }
+
   void addServer(ServerPrivateInfo info) {
     _servers.add(genInfo(info));
     locator<ServerStore>().put(info);
@@ -107,23 +132,27 @@ class ServerProvider extends BusyProvider {
   }
 
   void delServer(ServerPrivateInfo info) {
-    _servers.removeWhere((e) => e.info == info);
+    final idx = _servers.indexWhere((s) => s.info == info);
-    locator<ServerStore>().delete(info);
+    _servers[idx].client?.close();
+    _servers.removeAt(idx);
     notifyListeners();
+    locator<ServerStore>().delete(info);
   }
 
-  void updateServer(ServerPrivateInfo old, ServerPrivateInfo newInfo) {
+  Future<void> updateServer(
+      ServerPrivateInfo old, ServerPrivateInfo newInfo) async {
     final idx = _servers.indexWhere((e) => e.info == old);
     _servers[idx].info = newInfo;
-    _servers[idx].client = genClient(newInfo);
+    _servers[idx].client = await genClient(newInfo);
     locator<ServerStore>().update(old, newInfo);
     notifyListeners();
     refreshData(idx: idx);
   }
 
-  Future<ServerStatus?> _getData(ServerPrivateInfo info, int idx) async {
+  Future<void> _getData(int idx) async {
     final client = _servers[idx].client;
-    final connected = await client.isConnected();
+    final info = _servers[idx].info;
+    final connected = client != null;
     final state = _servers[idx].connectionState;
     if (!connected ||
         state == ServerConnectionState.failed ||
@@ -132,7 +161,7 @@ class ServerProvider extends BusyProvider {
       notifyListeners();
       final time1 = DateTime.now();
       try {
-        await client.connect();
+        _servers[idx].client = await genClient(info);
         final time2 = DateTime.now();
         logger.info(
             'Connected to [${info.name}] in [${time2.difference(time1).toString()}].');
@@ -140,37 +169,25 @@ class ServerProvider extends BusyProvider {
         notifyListeners();
       } catch (e) {
         _servers[idx].connectionState = ServerConnectionState.failed;
+        _servers[idx].status.failedInfo = e.toString();
         notifyListeners();
         logger.warning(e);
       }
     }
     try {
-      final cpu = await client.execute("cat /proc/stat | grep cpu") ?? '';
+      if (_servers[idx].client == null) return;
-      final cpuTemp = await client.execute(
+      _getCPU(_servers[idx]);
-              r"paste <(cat /sys/class/thermal/thermal_zone*/type) <(cat /sys/class/thermal/thermal_zone*/temp) | column -s $'\t' -t | sed 's/\(.\)..$/.\1°C/'") ??
+      _getMem(_servers[idx]);
-          '';
+      _getSysVer(_servers[idx]);
-      final mem = await client.execute('free -m') ?? '';
+      _getUpTime(_servers[idx]);
-      final sysVer =
+      _getDisk(_servers[idx]);
-          await client.execute('cat /etc/os-release | grep PRETTY_NAME') ?? '';
+      _getTcp(_servers[idx]);
-      final upTime = await client.execute('uptime') ?? '';
+      _getNetSpeed(_servers[idx]);
-      final disk = await client.execute('df -h') ?? '';
-      final tcp = await client.execute('cat /proc/net/snmp') ?? '';
-      final netSpeed =
-          await client.execute('cat /proc/net/dev && date +%s') ?? '';
-
-      return ServerStatus(
-          _getCPU(cpu, _servers[idx].status.cpu2Status, cpuTemp),
-          _getMem(mem),
-          _getSysVer(sysVer),
-          _getUpTime(upTime),
-          _getDisk(disk),
-          _getTcp(tcp),
-          _getNetSpeed(netSpeed, _servers[idx].status.netSpeed));
     } catch (e) {
       _servers[idx].connectionState = ServerConnectionState.failed;
+      servers[idx].status.failedInfo = e.toString();
       notifyListeners();
       logger.warning(e);
-      return null;
     }
   }
 
@@ -180,10 +197,13 @@ class ServerProvider extends BusyProvider {
   ///   lo: 45929941  269112    0    0    0     0          0         0 45929941  269112    0    0    0     0       0          0
   ///   eth0: 48481023  505772    0    0    0     0          0         0 36002262  202307    0    0    0     0       0          0
   /// 1635752901
-  NetSpeed _getNetSpeed(String raw, NetSpeed old) {
+  Future<void> _getNetSpeed(ServerInfo info) async {
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final raw = utf8.decode(await client.run('cat /proc/net/dev && date +%s'));
     final split = raw.split('\n');
     final deviceCount = split.length - 3;
-    if (deviceCount < 1) return emptyNetSpeed;
+    if (deviceCount < 1) return;
     final time = int.parse(split[split.length - 2]);
     final results = <NetSpeedPart>[];
     for (int idx = 2; idx < deviceCount; idx++) {
@@ -195,15 +215,23 @@ class ServerProvider extends BusyProvider {
       final bytesOut = int.parse(bytes[8]);
       results.add(NetSpeedPart(device, bytesIn, bytesOut, time));
     }
-    return old.update(results);
+    info.status.netSpeed = info.status.netSpeed.update(results);
+    notifyListeners();
   }
 
-  String _getSysVer(String raw) {
+  Future<void> _getSysVer(ServerInfo info) async {
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final raw =
+        utf8.decode(await client.run('cat /etc/os-release | grep PRETTY_NAME'));
     final s = raw.split('=');
     if (s.length == 2) {
-      return s[1].replaceAll('"', '').replaceFirst('\n', '');
+      info.status.sysVer = s[1].replaceAll('"', '').replaceFirst('\n', '');
+    } else {
+      info.status.sysVer = '';
     }
-    return '';
+    
+    notifyListeners();
   }
 
   String _getCPUTemp(String raw) {
@@ -216,7 +244,12 @@ class ServerProvider extends BusyProvider {
     return '';
   }
 
-  Cpu2Status _getCPU(String raw, Cpu2Status old, String temp) {
+  Future<void> _getCPU(ServerInfo info) async {
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final raw = utf8.decode(await client.run("cat /proc/stat | grep cpu"));
+    final temp = utf8.decode(await client.run(
+        r"paste <(cat /sys/class/thermal/thermal_zone*/type) <(cat /sys/class/thermal/thermal_zone*/temp) | column -s $'\t' -t | sed 's/\(.\)..$/.\1°C/'"));
     final List<CpuStatus> cpus = [];
 
     for (var item in raw.split('\n')) {
@@ -234,32 +267,44 @@ class ServerProvider extends BusyProvider {
           int.parse(matches[6])));
     }
     if (cpus.isEmpty) {
-      return emptyCpu2Status;
+      info.status.cpu2Status = emptyCpu2Status;
+    } else {
+
+    info.status.cpu2Status =
+        info.status.cpu2Status.update(cpus, _getCPUTemp(temp));
     }
 
-    return old.update(cpus, _getCPUTemp(temp));
+    notifyListeners();
   }
 
-  String _getUpTime(String raw) {
+  Future<void> _getUpTime(ServerInfo info) async {
-    return raw.split('up ')[1].split(', ')[0];
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final raw = utf8.decode(await client.run('uptime'));
+    info.status.uptime = raw.split('up ')[1].split(', ')[0];
+    notifyListeners();
   }
 
-  TcpStatus _getTcp(String raw) {
+  Future<void> _getTcp(ServerInfo info) async {
+    final sidx = _servers.indexOf(info);
+    final client = _servers[sidx].client!;
+    final raw = utf8.decode(await client.run('cat /proc/net/snmp'));
     final lines = raw.split('\n');
-    int idx = 0;
+    final idx = lines.lastWhere((element) => element.startsWith('Tcp:'),
-    for (var item in lines) {
+        orElse: () => '');
-      if (item.contains('Tcp:')) {
+    if (idx != '') {
-        idx++;
+      final vals = idx.split(RegExp(r'\s{1,}'));
-      }
+      info.status.tcp = TcpStatus(vals[5].i, vals[6].i, vals[7].i, vals[8].i);
-      if (idx == 2) {
+    } else {
-        final vals = item.split(RegExp(r'\s{1,}'));
+      info.status.tcp = TcpStatus(0, 0, 0, 0);
-        return TcpStatus(vals[5].i, vals[6].i, vals[7].i, vals[8].i);
-      }
     }
-    return TcpStatus(0, 0, 0, 0);
+    notifyListeners();
   }
 
-  List<DiskInfo> _getDisk(String disk) {
+  Future<void> _getDisk(ServerInfo info) async {
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final disk = utf8.decode(await client.run('df -h'));
     final list = <DiskInfo>[];
     final items = disk.split('\n');
     for (var item in items) {
@@ -270,16 +315,20 @@ class ServerProvider extends BusyProvider {
       list.add(DiskInfo(vals[0], vals[5],
           int.parse(vals[4].replaceFirst('%', '')), vals[2], vals[1], vals[3]));
     }
-    return list;
+    info.status.disk = list;
+    notifyListeners();
   }
 
-  Memory _getMem(String mem) {
+  Future<void> _getMem(ServerInfo info) async {
+    final idx = _servers.indexOf(info);
+    final client = _servers[idx].client!;
+    final mem = utf8.decode(await client.run('free -m'));
     for (var item in mem.split('\n')) {
       if (item.contains('Mem:')) {
         final split = item.replaceFirst('Mem:', '').split(' ');
         split.removeWhere((e) => e == '');
         final memList = split.map((e) => int.parse(e)).toList();
-        return Memory(
+        info.status.memory = Memory(
             total: memList[0],
             used: memList[1],
             free: memList[2],
@@ -288,6 +337,11 @@ class ServerProvider extends BusyProvider {
             avail: memList[5]);
       }
     }
-    return emptyMemory;
+    notifyListeners();
+  }
+
+  Future<String?> runSnippet(int idx, Snippet snippet) async {
+    final result = await _servers[idx].client!.run(snippet.script);
+    return utf8.decode(result);
   }
 }

lib/data/provider/snippet.dart

@@ -0,0 +1,32 @@
+import 'package:toolbox/core/provider_base.dart';
+import 'package:toolbox/data/model/server/snippet.dart';
+import 'package:toolbox/data/store/snippet.dart';
+import 'package:toolbox/locator.dart';
+
+class SnippetProvider extends BusyProvider {
+  List<Snippet> get snippets => _snippets;
+  late List<Snippet> _snippets;
+
+  void loadData() {
+    _snippets = locator<SnippetStore>().fetch();
+  }
+
+  void addInfo(Snippet snippet) {
+    _snippets.add(snippet);
+    locator<SnippetStore>().put(snippet);
+    notifyListeners();
+  }
+
+  void delInfo(Snippet snippet) {
+    _snippets.removeWhere((e) => e.name == snippet.name);
+    locator<SnippetStore>().delete(snippet);
+    notifyListeners();
+  }
+
+  void updateInfo(Snippet old, Snippet newOne) {
+    final idx = _snippets.indexWhere((e) => e.name == old.name);
+    _snippets[idx] = newOne;
+    locator<SnippetStore>().update(old, newOne);
+    notifyListeners();
+  }
+}

lib/data/res/build_data.dart

@@ -2,9 +2,8 @@
 
 class BuildData {
   static const String name = "ToolBox";
-  static const int build = 55;
+  static const int build = 82;
-  static const String engine =
+  static const String engine = "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (4 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n";
-      "Flutter 2.5.3 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 18116933e7 (3 weeks ago) • 2021-10-15 10:46:35 -0700\nEngine • revision d3ea636dc5\nTools • Dart 2.14.4\n";
+  static const String buildAt = "2022-01-11 13:31:16.586591";
-  static const String buildAt = "2021-11-02 15:32:29.280614";
+  static const int modifications = 3;
-  static const int modifications = 1;
 }

lib/data/res/url.dart

@@ -1,5 +1,5 @@
-const backendUrl = 'https://v2.custed.lolli.tech';
+const backendUrl = 'https://res.lolli.tech';
-const baseUrl = backendUrl + '/res/toolbox';
+const baseUrl = backendUrl + '/toolbox';
 const joinQQGroupUrl = 'https://jq.qq.com/?_wv=1027&k=G0hUmPAq';
 const myGithub = 'https://github.com/LollipopKit';
 const rainSunMeGithub = 'https://github.com/RainSunMe';

lib/data/store/private_key.dart

@@ -15,6 +15,11 @@ class PrivateKeyStore extends PersistentStore {
         json.decode(box.get('key', defaultValue: '[]')!));
   }
 
+  PrivateKeyInfo get(String id) {
+    final ss = fetch();
+    return ss.firstWhere((e) => e.id == id);
+  }
+
   void delete(PrivateKeyInfo s) {
     final ss = fetch();
     ss.removeAt(index(s));

lib/locator.dart

@@ -3,6 +3,7 @@ import 'package:toolbox/data/provider/app.dart';
 import 'package:toolbox/data/provider/debug.dart';
 import 'package:toolbox/data/provider/private_key.dart';
 import 'package:toolbox/data/provider/server.dart';
+import 'package:toolbox/data/provider/snippet.dart';
 import 'package:toolbox/data/service/app.dart';
 import 'package:toolbox/data/store/private_key.dart';
 import 'package:toolbox/data/store/server.dart';
@@ -19,6 +20,7 @@ void setupLocatorForProviders() {
   locator.registerSingleton(AppProvider());
   locator.registerSingleton(DebugProvider());
   locator.registerSingleton(ServerProvider());
+  locator.registerSingleton(SnippetProvider());
   locator.registerSingleton(PrivateKeyProvider());
 }
 

lib/main.dart

@@ -10,11 +10,13 @@ import 'package:toolbox/data/provider/app.dart';
 import 'package:toolbox/data/provider/debug.dart';
 import 'package:toolbox/data/provider/private_key.dart';
 import 'package:toolbox/data/provider/server.dart';
+import 'package:toolbox/data/provider/snippet.dart';
 import 'package:toolbox/locator.dart';
 
 Future<void> initApp() async {
   await Hive.initFlutter();
   await setupLocator();
+  locator<SnippetProvider>().loadData();
   locator<PrivateKeyProvider>().loadData();
 
   ///设置Logger
@@ -62,6 +64,7 @@ Future<void> main() async {
           ChangeNotifierProvider(create: (_) => locator<AppProvider>()),
           ChangeNotifierProvider(create: (_) => locator<DebugProvider>()),
           ChangeNotifierProvider(create: (_) => locator<ServerProvider>()),
+          ChangeNotifierProvider(create: (_) => locator<SnippetProvider>()),
           ChangeNotifierProvider(create: (_) => locator<PrivateKeyProvider>()),
         ],
         child: const MyApp(),

lib/view/page/convert.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:clipboard/clipboard.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
+import 'package:toolbox/core/utils.dart';
 import 'package:toolbox/data/res/color.dart';
 
 class ConvertPage extends StatefulWidget {
@@ -47,30 +47,22 @@ class _ConvertPageState extends State<ConvertPage>
     return Scaffold(
       body: GestureDetector(
         child: SingleChildScrollView(
-          padding: const EdgeInsets.symmetric(horizontal: 7),
+            padding: const EdgeInsets.symmetric(horizontal: 7),
-          child: AnimationLimiter(
+            child: Column(children: [
-              child: Column(
-                  children: AnimationConfiguration.toStaggeredList(
-            duration: const Duration(milliseconds: 377),
-            childAnimationBuilder: (widget) => SlideAnimation(
-              verticalOffset: 50.0,
-              child: FadeInAnimation(
-                child: widget,
-              ),
-            ),
-            children: [
               const SizedBox(height: 13),
               _buildInputTop(),
               _buildTypeOption(),
               _buildResult(),
-            ],
+            ])),
-          ))),
-        ),
         onTap: () => FocusScope.of(context).requestFocus(FocusNode()),
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: () {
-          _textEditingControllerResult.text = doConvert();
+          try {
+            _textEditingControllerResult.text = doConvert();
+          } catch (e) {
+            showSnackBar(context, Text('Error: \n$e'));
+          }
         },
         tooltip: 'convert',
         child: const Icon(Icons.send),
@@ -79,7 +71,7 @@ class _ConvertPageState extends State<ConvertPage>
   }
 
   String doConvert() {
-    final text = _textEditingController.text;
+    final text = _textEditingController.text.trim();
     switch (_typeOptionIndex) {
       case 0:
         return utf8.decode(base64.decode(text));

lib/view/page/home.dart

@@ -13,7 +13,7 @@ import 'package:toolbox/data/res/url.dart';
 import 'package:toolbox/locator.dart';
 import 'package:toolbox/view/page/convert.dart';
 import 'package:toolbox/view/page/debug.dart';
-import 'package:toolbox/view/page/private_key/stored.dart';
+import 'package:toolbox/view/page/private_key/list.dart';
 import 'package:toolbox/view/page/server/tab.dart';
 import 'package:toolbox/view/page/setting.dart';
 import 'package:toolbox/view/page/snippet/list.dart';
@@ -31,16 +31,37 @@ class _MyHomePageState extends State<MyHomePage>
     with
         AutomaticKeepAliveClientMixin,
         SingleTickerProviderStateMixin,
-        AfterLayoutMixin {
+        AfterLayoutMixin,
+        WidgetsBindingObserver {
   final List<String> _tabs = ['Servers', 'En/Decode'];
   late final TabController _tabController;
+  late final ServerProvider _serverProvider;
 
   @override
   void initState() {
     super.initState();
+    _serverProvider = locator<ServerProvider>();
+    WidgetsBinding.instance?.addObserver(this);
     _tabController = TabController(length: _tabs.length, vsync: this);
   }
 
+  @override
+  void dispose() {
+    super.dispose();
+    WidgetsBinding.instance?.removeObserver(this);
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.paused) {
+      _serverProvider.stopAutoRefresh();
+    }
+    if (state == AppLifecycleState.resumed) {
+      _serverProvider.startAutoRefresh();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     setTransparentNavigationBar(context);
@@ -50,7 +71,7 @@ class _MyHomePageState extends State<MyHomePage>
         title: GestureDetector(
           onLongPress: () =>
               AppRoute(const DebugPage(), 'Debug Page').go(context),
-          child: const Text('ToolBox'),
+          child: const Text(BuildData.name),
         ),
         bottom: TabBar(
           indicatorColor: widget.primaryColor,
@@ -92,8 +113,7 @@ class _MyHomePageState extends State<MyHomePage>
             leading: const Icon(Icons.snippet_folder),
             title: const Text('Snippet'),
             onTap: () =>
-                AppRoute(const SnippetListPage(), 'snippet list')
+                AppRoute(const SnippetListPage(), 'snippet list').go(context),
-                    .go(context),
           ),
           AboutListTile(
             icon: const Icon(Icons.text_snippet),

lib/view/page/private_key/edit.dart

@@ -1,5 +1,8 @@
 import 'package:after_layout/after_layout.dart';
+import 'package:dartssh2/dartssh2.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:toolbox/core/utils.dart';
 import 'package:toolbox/data/model/server/private_key_info.dart';
 import 'package:toolbox/data/provider/private_key.dart';
 import 'package:toolbox/locator.dart';
@@ -21,11 +24,13 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
   final pwdController = TextEditingController();
 
   late PrivateKeyProvider _provider;
+  late Widget loading;
 
   @override
   void initState() {
     super.initState();
     _provider = locator<PrivateKeyProvider>();
+    loading = const SizedBox();
   }
 
   @override
@@ -65,13 +70,43 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
             obscureText: true,
             decoration: buildDecoration('Password', icon: Icons.password),
           ),
+          SizedBox(height: MediaQuery.of(context).size.height * 0.1),
+          loading
         ],
       ),
       floatingActionButton: FloatingActionButton(
-        child: const Icon(Icons.send),
+        child: const Icon(Icons.save),
-        onPressed: () {
+        onPressed: () async {
-          final info = PrivateKeyInfo(
+          final name = nameController.text;
-              nameController.text, keyController.text, pwdController.text);
+          final key = keyController.text;
+          final pwd = pwdController.text;
+          if (name.isEmpty || key.isEmpty || pwd.isEmpty) {
+            showSnackBar(
+                context, const Text('Three fields must not be empty.'));
+            return;
+          }
+          FocusScope.of(context).unfocus();
+          setState(() {
+            loading = const SizedBox(
+              height: 50,
+              child: Center(
+                child: CircularProgressIndicator(),
+              ),
+            );
+          });
+          final info = PrivateKeyInfo(name, key, pwd);
+          bool haveErr = false;
+          try {
+            info.privateKey = await compute(decyptPem, [key, pwd]);
+          } catch (e) {
+            showSnackBar(context, Text(e.toString()));
+            haveErr = true;
+          } finally {
+            setState(() {
+              loading = const SizedBox();
+            });
+          }
+          if (haveErr) return;
           if (widget.info != null) {
             _provider.updateInfo(widget.info!, info);
           } else {
@@ -92,3 +127,11 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
     }
   }
 }
+
+/// [args] : [key, pwd]
+String decyptPem(List<String> args) {
+  /// skip when the key is not encrypted, or will throw exception
+  if (!SSHKeyPair.isEncryptedPem(args[0])) return args[0];
+  final sshKey = SSHKeyPair.fromPem(args[0], args[1]);
+  return sshKey.first.toPem();
+}

lib/view/page/server/detail.dart

@@ -1,13 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:toolbox/core/route.dart';
 import 'package:toolbox/data/model/server/net_speed.dart';
 import 'package:toolbox/data/model/server/server.dart';
 import 'package:toolbox/data/model/server/server_status.dart';
 import 'package:toolbox/data/provider/server.dart';
 import 'package:toolbox/data/res/color.dart';
 import 'package:toolbox/data/res/icon/linux_icons.dart';
-import 'package:toolbox/view/page/server/edit.dart';
 import 'package:toolbox/view/widget/round_rect_card.dart';
 
 const style11 = TextStyle(fontSize: 11);
@@ -35,8 +33,8 @@ class _ServerDetailPageState extends State<ServerDetailPage>
   @override
   Widget build(BuildContext context) {
     return Consumer<ServerProvider>(builder: (_, provider, __) {
-      return _buildMainPage(
+      return _buildMainPage(provider.servers
-          provider.servers.firstWhere((e) => e.client.id == widget.id));
+          .firstWhere((e) => '${e.info.ip}:${e.info.port}' == widget.id));
     });
   }
 
@@ -44,12 +42,6 @@ class _ServerDetailPageState extends State<ServerDetailPage>
     return Scaffold(
       appBar: AppBar(
         title: Text(si.info.name),
-        actions: [IconButton(onPressed: () => AppRoute(
-                  ServerEditPage(
-                    spi: si.info,
-                  ),
-                  'Edit server info page')
-              .go(context), icon: const Icon(Icons.edit))],
       ),
       body: ListView(
         padding: const EdgeInsets.all(17),
@@ -60,7 +52,8 @@ class _ServerDetailPageState extends State<ServerDetailPage>
           _buildCPUView(si.status),
           _buildDiskView(si.status),
           _buildMemView(si.status),
-          _buildNetView(si.status.netSpeed)
+          _buildNetView(si.status.netSpeed),
+          SizedBox(height: _media.padding.bottom),
         ],
       ),
     );
@@ -180,6 +173,20 @@ class _ServerDetailPageState extends State<ServerDetailPage>
     ));
   }
 
+  String convertMB(int mb) {
+    const suffix = ['MB', 'GB', 'TB'];
+    double value = mb.toDouble();
+    int squareTimes = 0;
+    for (; value / 1024 > 1 && squareTimes < 3; squareTimes++) {
+      value /= 1024;
+    }
+    var finalValue = value.toStringAsFixed(1);
+    if (finalValue.endsWith('.0')) {
+      finalValue = finalValue.replaceFirst('.0', '');
+    }
+    return '$finalValue ${suffix[squareTimes]}';
+  }
+
   Widget _buildMemView(ServerStatus ss) {
     final pColor = primaryColor;
     final used = ss.memory.used / ss.memory.total;
@@ -193,9 +200,11 @@ class _ServerDetailPageState extends State<ServerDetailPage>
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              _buildMemExplain('Used', pColor),
+              _buildMemExplain(convertMB(ss.memory.used), pColor),
-              _buildMemExplain('Cache', pColor.withAlpha(77)),
+              _buildMemExplain(
-              _buildMemExplain('Avail', progressColor.resolve(context))
+                  convertMB(ss.memory.cache), pColor.withAlpha(77)),
+              _buildMemExplain(convertMB(ss.memory.total - ss.memory.used),
+                  progressColor.resolve(context))
             ],
           ),
           const SizedBox(
@@ -215,7 +224,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
                   // memory.total == 1: failed to get mem, now mem = [emptyMemory] which is initial value.
                   value: ss.memory.total == 1
                       ? 0
-                      : ss.memory.cache / ss.memory.total,
+                      : ss.memory.cache / (ss.memory.total - ss.memory.used),
                   backgroundColor: progressColor.resolve(context),
                   color: pColor.withAlpha(77),
                 ),
@@ -227,7 +236,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
     ));
   }
 
-  Widget _buildMemExplain(String type, Color color) {
+  Widget _buildMemExplain(String value, Color color) {
     return Row(
       children: [
         Container(
@@ -236,7 +245,12 @@ class _ServerDetailPageState extends State<ServerDetailPage>
           width: 11,
         ),
         const SizedBox(width: 4),
-        Text(type, style: style11, textScaleFactor: 1.0)
+        Text(
+          value,
+          style: style11,
+          textScaleFactor: 1.0,
+          textAlign: TextAlign.center,
+        )
       ],
     );
   }

lib/view/page/server/edit.dart

@@ -59,6 +59,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
                             onPressed: () {
                               _serverProvider.delServer(widget.spi!);
                               Navigator.of(context).pop();
+                              Navigator.of(context).pop();
                             },
                             child: const Text(
                               'Yes',

lib/view/page/server/tab.dart

@@ -1,15 +1,16 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:circle_chart/circle_chart.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:get_it/get_it.dart';
+import 'package:marquee/marquee.dart';
 import 'package:provider/provider.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:toolbox/core/route.dart';
 import 'package:toolbox/data/model/server/server.dart';
 import 'package:toolbox/data/model/server/server_connection_state.dart';
 import 'package:toolbox/data/model/server/server_status.dart';
 import 'package:toolbox/data/provider/server.dart';
+import 'package:toolbox/data/res/color.dart';
 import 'package:toolbox/data/store/setting.dart';
 import 'package:toolbox/locator.dart';
 import 'package:toolbox/view/page/server/detail.dart';
@@ -27,6 +28,7 @@ class _ServerPageState extends State<ServerPage>
   late MediaQueryData _media;
   late ThemeData _theme;
   late Color _primaryColor;
+  late RefreshController _refreshController;
 
   late ServerProvider _serverProvider;
 
@@ -34,6 +36,7 @@ class _ServerPageState extends State<ServerPage>
   void initState() {
     super.initState();
     _serverProvider = locator<ServerProvider>();
+    _refreshController = RefreshController();
   }
 
   @override
@@ -41,41 +44,44 @@ class _ServerPageState extends State<ServerPage>
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
     _theme = Theme.of(context);
-    _primaryColor = Color(locator<SettingStore>().primaryColor.fetch()!);
+    _primaryColor = primaryColor;
   }
 
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Scaffold(
+    final autoUpdate =
-      body: Consumer<ServerProvider>(builder: (_, pro, __) {
+        locator<SettingStore>().serverStatusUpdateInterval.fetch() != 0;
-        if (pro.servers.isEmpty) {
+    final child = Consumer<ServerProvider>(builder: (_, pro, __) {
-          return const Center(
+      if (pro.servers.isEmpty) {
-            child: Text(
+        return const Center(
-              'There is no server.\nClick the fab to add one.',
+          child: Text(
-              textAlign: TextAlign.center,
+            'There is no server.\nClick the fab to add one.',
-            ),
+            textAlign: TextAlign.center,
-          );
+          ),
-        }
+        );
-        return SingleChildScrollView(
+      }
+      return SingleChildScrollView(
           padding: const EdgeInsets.symmetric(horizontal: 7),
-          child: AnimationLimiter(
+          child: Column(
-              child: Column(
-                  children: AnimationConfiguration.toStaggeredList(
-            duration: const Duration(milliseconds: 377),
-            childAnimationBuilder: (widget) => SlideAnimation(
-              verticalOffset: 50.0,
-              child: FadeInAnimation(
-                child: widget,
-              ),
-            ),
             children: [
               const SizedBox(height: 13),
-              ...pro.servers.map((e) => _buildEachServerCard(e))
+              ...pro.servers.map((e) => _buildEachServerCard(e)),
+              SizedBox(height: _media.padding.bottom),
             ],
-          ))),
+          ));
-        );
+    });
-      }),
+    return Scaffold(
+      body: autoUpdate
+          ? child
+          : SmartRefresher(
+              controller: _refreshController,
+              child: child,
+              onRefresh: () async {
+                await _serverProvider.refreshData();
+                _refreshController.refreshCompleted();
+              },
+            ),
       floatingActionButton: FloatingActionButton(
         onPressed: () =>
             AppRoute(const ServerEditPage(), 'Add server info page')
@@ -91,19 +97,21 @@ class _ServerPageState extends State<ServerPage>
     return Card(
       child: InkWell(
         onLongPress: () => AppRoute(
-                  ServerEditPage(
+                ServerEditPage(
-                    spi: si.info,
+                  spi: si.info,
-                  ),
+                ),
-                  'Edit server info page')
+                'Edit server info page')
-              .go(context),
+            .go(context),
         child: Padding(
           padding: const EdgeInsets.all(13),
-          child:
+          child: SizedBox(
-              _buildRealServerCard(si.status, si.info.name, si.connectionState),
+              height: _media.size.height * 0.147,
+              child: _buildRealServerCard(
+                  si.status, si.info.name, si.connectionState)),
         ),
-        onTap: () =>
+        onTap: () => AppRoute(ServerDetailPage('${si.info.ip}:${si.info.port}'),
-            AppRoute(ServerDetailPage(si.client.id!), 'server detail page')
+                'server detail page')
-                .go(context),
+            .go(context),
       ),
     );
   }
@@ -113,6 +121,13 @@ class _ServerPageState extends State<ServerPage>
     final rootDisk =
         ss.disk.firstWhere((element) => element.mountLocation == '/');
 
+    final topRightStr =
+        getTopRightStr(cs, ss.cpu2Status.temp, ss.uptime, ss.failedInfo);
+    final hasError =
+        cs == ServerConnectionState.failed && ss.failedInfo != null;
+    final style = TextStyle(
+        color: _theme.textTheme.bodyText1!.color!.withAlpha(100), fontSize: 11);
+
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -124,11 +139,20 @@ class _ServerPageState extends State<ServerPage>
               style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
               textScaleFactor: 1.0,
             ),
-            Text(getTopRightStr(cs, ss.cpu2Status.temp, ss.uptime),
+            hasError
-                textScaleFactor: 1.0,
+                ? ConstrainedBox(
-                style: TextStyle(
+                    constraints: BoxConstraints(
-                    color: _theme.textTheme.bodyText1!.color!.withAlpha(100),
+                        maxWidth: _media.size.width * 0.57, maxHeight: 17),
-                    fontSize: 11))
+                    child: Marquee(
+                        accelerationDuration: const Duration(seconds: 3),
+                        accelerationCurve: Curves.linear,
+                        decelerationDuration: const Duration(seconds: 3),
+                        decelerationCurve: Curves.linear,
+                        text: topRightStr,
+                        textScaleFactor: 1.0,
+                        style: style),
+                  )
+                : Text(topRightStr, style: style, textScaleFactor: 1.0),
           ],
         ),
         const SizedBox(
@@ -149,7 +173,8 @@ class _ServerPageState extends State<ServerPage>
     );
   }
 
-  String getTopRightStr(ServerConnectionState cs, String temp, String upTime) {
+  String getTopRightStr(ServerConnectionState cs, String temp, String upTime,
+      String? failedInfo) {
     switch (cs) {
       case ServerConnectionState.disconnected:
         return 'Disconnected';
@@ -158,7 +183,13 @@ class _ServerPageState extends State<ServerPage>
       case ServerConnectionState.connecting:
         return 'Connecting...';
       case ServerConnectionState.failed:
-        return 'Failed';
+        if (failedInfo == null) {
+          return 'Failed';
+        }
+        if (failedInfo.contains('encypted')) {
+          return 'Please "save" this private key again.';
+        }
+        return failedInfo;
       default:
         return 'Unknown State';
     }
@@ -205,6 +236,7 @@ class _ServerPageState extends State<ServerPage>
   Widget _buildPercentCircle(double percent, String title) {
     if (percent <= 0) percent = 0.01;
     if (percent >= 100) percent = 99.9;
+    var size = _media.size.height * 0.15;
     return SizedBox(
       width: _media.size.width * 0.2,
       height: _media.size.height * 0.1,
@@ -217,8 +249,8 @@ class _ServerPageState extends State<ServerPage>
                 progressColor: _primaryColor,
                 progressNumber: percent,
                 maxNumber: 100,
-                width: _media.size.width * 0.37,
+                width: size,
-                height: _media.size.height * 0.09,
+                height: size / 1.5,
               ),
               Positioned.fill(
                 child: Center(
@@ -251,6 +283,6 @@ class _ServerPageState extends State<ServerPage>
     await GetIt.I.allReady();
     await _serverProvider.loadLocalData();
     await _serverProvider.refreshData();
-    await _serverProvider.startAutoRefresh();
+    _serverProvider.startAutoRefresh();
   }
 }

lib/view/page/setting.dart

@@ -1,5 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_material_color_picker/flutter_material_color_picker.dart';
+import 'package:provider/provider.dart';
+import 'package:toolbox/core/update.dart';
+import 'package:toolbox/data/provider/app.dart';
+import 'package:toolbox/data/provider/server.dart';
+import 'package:toolbox/data/res/build_data.dart';
 import 'package:toolbox/data/res/color.dart';
 import 'package:toolbox/data/store/setting.dart';
 import 'package:toolbox/locator.dart';
@@ -17,6 +22,8 @@ class _SettingPageState extends State<SettingPage> {
   late int _selectedColorValue;
   double _intervalValue = 0;
   late Color priColor;
+  static const textStyle = TextStyle(fontSize: 14);
+  late final ServerProvider _serverProvider;
 
   @override
   void didChangeDependencies() {
@@ -27,6 +34,7 @@ class _SettingPageState extends State<SettingPage> {
   @override
   void initState() {
     super.initState();
+    _serverProvider = locator<ServerProvider>();
     _store = locator<SettingStore>();
     _intervalValue = _store.serverStatusUpdateInterval.fetch()!.toDouble();
   }
@@ -40,56 +48,89 @@ class _SettingPageState extends State<SettingPage> {
       body: ListView(
         padding: const EdgeInsets.all(17),
         children: [
-          RoundRectCard(_buildAppColorPreview()),
+          _buildAppColorPreview(),
-          RoundRectCard(
+          _buildUpdateInterval(),
-            ExpansionTile(
+          _buildCheckUpdate()
-              tilePadding: EdgeInsets.zero,
+        ].map((e) => RoundRectCard(e)).toList(),
-              childrenPadding: EdgeInsets.zero,
-              textColor: priColor,
-              title: const Text(
-                'Server status update interval',
-                style: TextStyle(fontSize: 14),
-                textAlign: TextAlign.start,
-              ),
-              subtitle: const Text(
-                'Will take effect the next time app launches.',
-                style: TextStyle(color: Colors.grey),
-              ),
-              trailing: Text('${_intervalValue.toInt()} s'),
-              children: [
-                Slider(
-                  thumbColor: priColor,
-                  activeColor: priColor.withOpacity(0.7),
-                  min: 0,
-                  max: 10,
-                  value: _intervalValue,
-                  onChanged: (newValue) {
-                    setState(() {
-                      _intervalValue = newValue;
-                    });
-                  },
-                  onChangeEnd: (val) =>
-                      _store.serverStatusUpdateInterval.put(val.toInt()),
-                  label: '${_intervalValue.toInt()} seconds',
-                  divisions: 10,
-                ),
-                const SizedBox(
-                  height: 3,
-                ),
-                _intervalValue == 0.0
-                    ? const Text('You set to 0, will not update automatically.')
-                    : const SizedBox(),
-                const SizedBox(
-                  height: 13,
-                )
-              ],
-            ),
-          )
-        ],
       ),
     );
   }
 
+  Widget _buildCheckUpdate() {
+    return Consumer<AppProvider>(builder: (_, app, __) {
+      String display;
+      if (app.newestBuild != null) {
+        if (app.newestBuild! > BuildData.build) {
+          display = 'Found: v1.0.${app.newestBuild}, click to update';
+        } else {
+          display = 'Current: v1.0.${BuildData.build}，is up to date';
+        }
+      } else {
+        display = 'Current: v1.0.${BuildData.build}';
+      }
+      return ListTile(
+          contentPadding: EdgeInsets.zero,
+          trailing: const Icon(Icons.keyboard_arrow_right),
+          title: Text(
+            display,
+            style: textStyle,
+            textAlign: TextAlign.start,
+          ),
+          onTap: () => doUpdate(context, force: true));
+    });
+  }
+
+  Widget _buildUpdateInterval() {
+    return ExpansionTile(
+      tilePadding: EdgeInsets.zero,
+      childrenPadding: EdgeInsets.zero,
+      textColor: priColor,
+      title: const Text(
+        'Server status update interval',
+        style: textStyle,
+        textAlign: TextAlign.start,
+      ),
+      subtitle: const Text(
+        'Will take effect immediately.',
+        style: TextStyle(color: Colors.grey),
+      ),
+      trailing: Text('${_intervalValue.toInt()} s'),
+      children: [
+        Slider(
+          thumbColor: priColor,
+          activeColor: priColor.withOpacity(0.7),
+          min: 0,
+          max: 10,
+          value: _intervalValue,
+          onChanged: (newValue) {
+            setState(() {
+              _intervalValue = newValue;
+            });
+          },
+          onChangeEnd: (val) {
+            _store.serverStatusUpdateInterval.put(val.toInt());
+            _serverProvider.startAutoRefresh();
+          },
+          label: '${_intervalValue.toInt()} seconds',
+          divisions: 10,
+        ),
+        const SizedBox(
+          height: 3,
+        ),
+        _intervalValue == 0.0
+            ? const Text(
+                'You set to 0, will not update automatically.\nYou can pull to refresh manually.',
+                style: TextStyle(color: Colors.grey),
+                textAlign: TextAlign.center,
+              )
+            : const SizedBox(),
+        const SizedBox(
+          height: 13,
+        )
+      ],
+    );
+  }
+
   Widget _buildAppColorPreview() {
     return ExpansionTile(
         textColor: priColor,
@@ -108,7 +149,7 @@ class _SettingPageState extends State<SettingPage> {
         ),
         title: const Text(
           'App primary color',
-          style: TextStyle(fontSize: 14),
+          style: textStyle,
         ));
   }
 

lib/view/page/snippet/edit.dart

@@ -1,15 +1,91 @@
+import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:toolbox/core/utils.dart';
+import 'package:toolbox/data/model/server/snippet.dart';
+import 'package:toolbox/data/provider/snippet.dart';
+import 'package:toolbox/locator.dart';
+import 'package:toolbox/view/widget/input_decoration.dart';
 
 class SnippetEditPage extends StatefulWidget {
-  const SnippetEditPage({Key? key}) : super(key: key);
+  const SnippetEditPage({Key? key, this.snippet}) : super(key: key);
+
+  final Snippet? snippet;
 
   @override
   _SnippetEditPageState createState() => _SnippetEditPageState();
 }
 
-class _SnippetEditPageState extends State<SnippetEditPage> {
+class _SnippetEditPageState extends State<SnippetEditPage>
+    with AfterLayoutMixin {
+  final nameController = TextEditingController();
+  final scriptController = TextEditingController();
+
+  late SnippetProvider _provider;
+
+  @override
+  void initState() {
+    super.initState();
+    _provider = locator<SnippetProvider>();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return Scaffold(
+      appBar: AppBar(title: const Text('Edit'), actions: [
+        widget.snippet != null
+            ? IconButton(
+                onPressed: () {
+                  _provider.delInfo(widget.snippet!);
+                  Navigator.of(context).pop();
+                },
+                icon: const Icon(Icons.delete))
+            : const SizedBox()
+      ]),
+      body: ListView(
+        padding: const EdgeInsets.all(13),
+        children: [
+          TextField(
+            controller: nameController,
+            keyboardType: TextInputType.text,
+            decoration: buildDecoration('Name', icon: Icons.info),
+          ),
+          TextField(
+            controller: scriptController,
+            autocorrect: false,
+            minLines: 3,
+            maxLines: 10,
+            keyboardType: TextInputType.text,
+            enableSuggestions: false,
+            decoration: buildDecoration('Snippet', icon: Icons.code),
+          ),
+        ],
+      ),
+      floatingActionButton: FloatingActionButton(
+        child: const Icon(Icons.send),
+        onPressed: () {
+          final name = nameController.text;
+          final script = scriptController.text;
+          if (name.isEmpty || script.isEmpty) {
+            showSnackBar(context, const Text('Two fields must not be empty.'));
+            return;
+          }
+          final snippet = Snippet(name, script);
+          if (widget.snippet != null) {
+            _provider.updateInfo(widget.snippet!, snippet);
+          } else {
+            _provider.addInfo(snippet);
+          }
+          Navigator.of(context).pop();
+        },
+      ),
+    );
+  }
+
+  @override
+  void afterFirstLayout(BuildContext context) {
+    if (widget.snippet != null) {
+      nameController.text = widget.snippet!.name;
+      scriptController.text = widget.snippet!.script;
+    }
   }
 }

lib/view/page/snippet/list.dart

@@ -1,4 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:toolbox/core/route.dart';
+import 'package:toolbox/core/utils.dart';
+import 'package:toolbox/data/model/server/snippet.dart';
+import 'package:toolbox/data/provider/server.dart';
+import 'package:toolbox/data/provider/snippet.dart';
+import 'package:toolbox/data/res/color.dart';
+import 'package:toolbox/locator.dart';
+import 'package:toolbox/view/page/snippet/edit.dart';
+import 'package:toolbox/view/widget/round_rect_card.dart';
 
 class SnippetListPage extends StatefulWidget {
   const SnippetListPage({Key? key}) : super(key: key);
@@ -8,8 +18,122 @@ class SnippetListPage extends StatefulWidget {
 }
 
 class _SnippetListPageState extends State<SnippetListPage> {
+  int _selectedIndex = 0;
+
+  final _textStyle = TextStyle(color: primaryColor);
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Snippet List'),
+      ),
+      body: _buildBody(),
+      floatingActionButton: FloatingActionButton(
+        child: const Icon(Icons.add),
+        onPressed: () =>
+            AppRoute(const SnippetEditPage(), 'snippet edit page').go(context),
+      ),
+    );
+  }
+
+  Widget _buildBody() {
+    return Consumer<SnippetProvider>(
+      builder: (_, key, __) {
+        return key.snippets.isNotEmpty
+            ? ListView.builder(
+                padding: const EdgeInsets.all(13),
+                itemCount: key.snippets.length,
+                itemExtent: 57,
+                itemBuilder: (context, idx) {
+                  return RoundRectCard(Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        key.snippets[idx].name,
+                        textAlign: TextAlign.center,
+                      ),
+                      Row(children: [
+                        TextButton(
+                            onPressed: () => AppRoute(
+                                    SnippetEditPage(snippet: key.snippets[idx]),
+                                    'snippet edit page')
+                                .go(context),
+                            child: Text(
+                              'Edit',
+                              style: _textStyle,
+                            )),
+                        TextButton(
+                            onPressed: () => _showRunDialog(key.snippets[idx]),
+                            child: Text(
+                              'Run',
+                              style: _textStyle,
+                            ))
+                      ])
+                    ],
+                  ));
+                })
+            : const Center(child: Text('No saved snippets.'));
+      },
+    );
+  }
+
+  void _showRunDialog(Snippet snippet) {
+    showRoundDialog(context, 'Choose destination',
+        Consumer<ServerProvider>(builder: (_, provider, __) {
+      if (provider.servers.isEmpty) {
+        return const Text('No server available');
+      }
+      return SizedBox(
+          height: 111,
+          child: Stack(children: [
+            Positioned(
+              child: Container(
+                height: 37,
+                decoration: const BoxDecoration(
+                  borderRadius: BorderRadius.all(Radius.circular(7)),
+                  color: Colors.black12,
+                ),
+              ),
+              top: 36,
+              bottom: 36,
+              left: 0,
+              right: 0,
+            ),
+            ListWheelScrollView.useDelegate(
+              itemExtent: 37,
+              diameterRatio: 1.2,
+              controller: FixedExtentScrollController(initialItem: 0),
+              onSelectedItemChanged: (idx) => _selectedIndex = idx,
+              physics: const FixedExtentScrollPhysics(),
+              childDelegate: ListWheelChildBuilderDelegate(
+                  builder: (context, index) => Center(
+                        child: Text(
+                          provider.servers[index].info.name,
+                          textAlign: TextAlign.center,
+                        ),
+                      ),
+                  childCount: provider.servers.length),
+            )
+          ]));
+    }), [
+      TextButton(
+          onPressed: () async {
+            final result = await locator<ServerProvider>()
+                .runSnippet(_selectedIndex, snippet);
+            if (result != null) {
+              showRoundDialog(context, 'Result',
+                  Text(result, style: const TextStyle(fontSize: 13)), [
+                TextButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    child: const Text('Close'))
+              ]);
+            }
+          },
+          child: const Text('Run')),
+      TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Cancel')),
+    ]);
   }
 }

linux/.gitignore

@@ -0,0 +1 @@
+flutter/ephemeral

linux/CMakeLists.txt

@@ -0,0 +1,116 @@
+cmake_minimum_required(VERSION 3.10)
+project(runner LANGUAGES CXX)
+
+set(BINARY_NAME "toolbox")
+set(APPLICATION_ID "tech.lolli.toolbox")
+
+cmake_policy(SET CMP0063 NEW)
+
+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()
+
+# Configure build 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.
+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 "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+endfunction()
+
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+
+# Flutter library and tool build rules.
+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}")
+
+# Application build
+add_executable(${BINARY_NAME}
+  "main.cc"
+  "my_application.cc"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+)
+apply_standard_settings(${BINARY_NAME})
+target_link_libraries(${BINARY_NAME} PRIVATE flutter)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+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)
+
+if(PLUGIN_BUNDLED_LIBRARIES)
+  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()
+
+# 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()

linux/flutter/CMakeLists.txt

@@ -0,0 +1,87 @@
+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}
+)

linux/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <url_launcher_linux/url_launcher_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+}

linux/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

linux/flutter/generated_plugins.cmake

@@ -0,0 +1,16 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_linux
+)
+
+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 $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)

linux/main.cc

@@ -0,0 +1,6 @@
+#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);
+}

linux/my_application.cc

@@ -0,0 +1,104 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.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, "ServerBox");
+    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, "ServerBox");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  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));
+
+  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));
+}

linux/my_application.h

@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+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_

macos/Runner.xcodeproj/project.pbxproj

@@ -56,7 +56,7 @@
 		11B144C2A4236173ED27E4BD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* toolbox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = toolbox.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* ServerBox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ServerBox.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -94,7 +94,6 @@
 				4677EE1296857C03A50C6F9A /* Pods-Runner.release.xcconfig */,
 				11B144C2A4236173ED27E4BD /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -123,7 +122,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* toolbox.app */,
+				33CC10ED2044A3C60003C045 /* ServerBox.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -193,7 +192,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* toolbox.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* ServerBox.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -421,11 +420,15 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 79;
+				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};
@@ -547,11 +550,15 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 79;
+				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -567,11 +574,15 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 79;
+				DEVELOPMENT_TEAM = BA88US33G6;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MARKETING_VERSION = 1.0.79;
+				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};

macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
   "images" : [
     {
+      "idiom" : "mac",
       "size" : "16x16",
-      "idiom" : "mac",
+      "scale" : "1x",
-      "filename" : "app_icon_16.png",
+      "filename" : "icon_16@1x.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "mac",
       "size" : "16x16",
-      "idiom" : "mac",
+      "scale" : "2x",
-      "filename" : "app_icon_32.png",
+      "filename" : "icon_16@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "mac",
       "size" : "32x32",
-      "idiom" : "mac",
+      "scale" : "1x",
-      "filename" : "app_icon_32.png",
+      "filename" : "icon_32@1x.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "mac",
       "size" : "32x32",
-      "idiom" : "mac",
+      "scale" : "2x",
-      "filename" : "app_icon_64.png",
+      "filename" : "icon_32@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "mac",
       "size" : "128x128",
-      "idiom" : "mac",
+      "scale" : "1x",
-      "filename" : "app_icon_128.png",
+      "filename" : "icon_128@1x.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "mac",
       "size" : "128x128",
-      "idiom" : "mac",
+      "scale" : "2x",
-      "filename" : "app_icon_256.png",
+      "filename" : "icon_128@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "mac",
       "size" : "256x256",
-      "idiom" : "mac",
+      "scale" : "1x",
-      "filename" : "app_icon_256.png",
+      "filename" : "icon_256@1x.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "mac",
       "size" : "256x256",
-      "idiom" : "mac",
+      "scale" : "2x",
-      "filename" : "app_icon_512.png",
+      "filename" : "icon_256@2x.png"
-      "scale" : "2x"
     },
     {
-      "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "app_icon_512.png",
+      "size" : "512x512",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "icon_512@1x.png"
     },
     {
-      "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
+      "size" : "512x512",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "icon_512@2x.png"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}

macos/Runner/Configs/AppInfo.xcconfig

@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = toolbox
+PRODUCT_NAME = ServerBox
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.toolbox
+PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2021 tech.lolli. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2022 tech.lolli. All rights reserved.

macos/Runner/DebugProfile.entitlements

@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

macos/Runner/Info.plist

@@ -17,9 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

macos/Runner/MainFlutterWindow.swift

@@ -4,7 +4,8 @@ import FlutterMacOS
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
     let flutterViewController = FlutterViewController.init()
-    let windowFrame = self.frame
+    var windowFrame = self.frame
+    windowFrame.size = CGSize(width: 450, height: 800)
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)
 

macos/Runner/Release.entitlements

@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

make.dart

@@ -4,7 +4,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-const appName = 'ToolBox';
+const appName = 'ServerBox';
 
 Future<int> getGitCommitCount() async {
   final result = await Process.run('git', ['log', '--oneline']);

pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.8"
   args:
     dependency: transitive
     description:
@@ -22,13 +22,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
+  asn1lib:
+    dependency: transitive
+    description:
+      name: asn1lib
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -42,7 +49,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -80,6 +87,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   countly_flutter:
     dependency: "direct main"
     description:
@@ -96,13 +110,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  dart_console:
+    dependency: transitive
+    description:
+      name: dart_console
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  dartssh2:
+    dependency: "direct main"
+    description:
+      name: dartssh2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.0-pre"
   dio:
     dependency: "direct main"
     description:
       name: dio
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.4"
   extended_image:
     dependency: "direct main"
     description:
@@ -116,7 +144,14 @@ packages:
       name: extended_image_library
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
+  fading_edge_scrollview:
+    dependency: transitive
+    description:
+      name: fading_edge_scrollview
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   fake_async:
     dependency: transitive
     description:
@@ -163,21 +198,14 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
-  flutter_staggered_animations:
-    dependency: "direct main"
-    description:
-      name: flutter_staggered_animations
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -201,7 +229,7 @@ packages:
       name: hive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   hive_flutter:
     dependency: "direct main"
     description:
@@ -236,7 +264,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.8"
+    version: "3.1.0"
   js:
     dependency: transitive
     description:
@@ -258,13 +286,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  marquee:
+    dependency: "direct main"
+    description:
+      name: marquee
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
@@ -292,35 +327,49 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.8"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.11"
+  path_provider_ios:
+    dependency: transitive
+    description:
+      name: path_provider_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.7"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.4"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   pedantic:
     dependency: transitive
     description:
@@ -335,20 +384,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.4.0"
+  pinenacl:
+    dependency: transitive
+    description:
+      name: pinenacl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.3"
   platform:
     dependency: transitive
     description:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.2"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.0"
   process:
     dependency: transitive
     description:
@@ -362,7 +425,21 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.2"
+  pull_to_refresh:
+    dependency: "direct main"
+    description:
+      name: pull_to_refresh
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  r_upgrade:
+    dependency: "direct main"
+    description:
+      name: r_upgrade
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.7+2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -375,13 +452,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.1"
-  ssh2:
-    dependency: "direct main"
-    description:
-      name: ssh2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.3"
   stack_trace:
     dependency: transitive
     description:
@@ -416,7 +486,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -437,7 +507,21 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.12"
+    version: "6.0.17"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.13"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.13"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -458,14 +542,14 @@ packages:
       name: url_launcher_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -473,27 +557,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
-  uuid:
+  validators:
     dependency: transitive
     description:
-      name: uuid
+      name: validators
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.10"
+    version: "2.3.3"
   xdg_directories:
     dependency: transitive
     description:
@@ -516,5 +600,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
+  dart: ">=2.15.1 <3.0.0"
   flutter: ">=2.5.0"

pubspec.yaml

@@ -36,14 +36,13 @@ dependencies:
   hive_flutter: ^1.0.0
   dio: ^4.0.0
   after_layout: ^1.1.0
-  flutter_staggered_animations: ^1.0.0
   extended_image: ^5.1.3
   url_launcher: ^6.0.9
   countly_flutter:
     git: 
       url: https://github.com/Countly/countly-sdk-flutter-bridge.git
       ref: master
-  ssh2: ^2.2.3
+  dartssh2: ^2.3.0-pre
   logging: ^1.0.2
   flutter_material_color_picker: ^1.1.0+2
   circle_chart: 
@@ -51,6 +50,9 @@ dependencies:
       url: https://github.com/LollipopKit/circle_chart
       ref: main
   clipboard: ^0.1.3
+  r_upgrade: ^0.3.6
+  pull_to_refresh: ^2.0.0
+  marquee: ^2.2.0
 
 
 dev_dependencies:

web/index.html

@@ -26,7 +26,7 @@
   <meta name="apple-mobile-web-app-title" content="toolbox">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
-  <title>toolbox</title>
+  <title>ServerBox</title>
   <link rel="manifest" href="manifest.json">
   <link rel="stylesheet" type="text/css" href="splash/style.css">
 </head>

windows/.gitignore

@@ -0,0 +1,17 @@
+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/

windows/CMakeLists.txt

@@ -0,0 +1,95 @@
+cmake_minimum_required(VERSION 3.14)
+project(toolbox LANGUAGES CXX)
+
+set(BINARY_NAME "ServerBox")
+
+cmake_policy(SET CMP0063 NEW)
+
+set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
+
+# Configure build options.
+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()
+
+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.
+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 "$<$<CONFIG:Debug>:_DEBUG>")
+endfunction()
+
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+
+# Flutter library and tool build rules.
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# Application build
+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 "$<TARGET_FILE_DIR:${BINARY_NAME}>")
+# 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()
+
+# 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)

windows/flutter/CMakeLists.txt

@@ -0,0 +1,103 @@
+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")
+
+# === 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"
+      windows-x64 $<CONFIG>
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+  ${CPP_WRAPPER_SOURCES_APP}
+)

windows/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,14 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <url_launcher_windows/url_launcher_windows.h>
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+}

windows/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

windows/flutter/generated_plugins.cmake

@@ -0,0 +1,16 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_windows
+)
+
+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 $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)

windows/runner/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.14)
+project(runner LANGUAGES CXX)
+
+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_standard_settings(${BINARY_NAME})
+target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+add_dependencies(${BINARY_NAME} flutter_assemble)

windows/runner/Runner.rc

@@ -0,0 +1,121 @@
+// 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
+//
+
+#ifdef FLUTTER_BUILD_NUMBER
+#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#else
+#define VERSION_AS_NUMBER 1,0,0
+#endif
+
+#ifdef FLUTTER_BUILD_NAME
+#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#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", "tech.lolli" "\0"
+            VALUE "FileDescription", "A new Flutter project." "\0"
+            VALUE "FileVersion", VERSION_AS_STRING "\0"
+            VALUE "InternalName", "toolbox" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2022 tech.lolli. All rights reserved." "\0"
+            VALUE "OriginalFilename", "toolbox.exe" "\0"
+            VALUE "ProductName", "toolbox" "\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

windows/runner/flutter_window.cpp

@@ -0,0 +1,61 @@
+#include "flutter_window.h"
+
+#include <optional>
+
+#include "flutter/generated_plugin_registrant.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<flutter::FlutterViewController>(
+      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());
+  SetChildContent(flutter_controller_->view()->GetNativeWindow());
+  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<LRESULT> 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);
+}

windows/runner/flutter_window.h

@@ -0,0 +1,33 @@
+#ifndef RUNNER_FLUTTER_WINDOW_H_
+#define RUNNER_FLUTTER_WINDOW_H_
+
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+
+#include <memory>
+
+#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::FlutterViewController> flutter_controller_;
+};
+
+#endif  // RUNNER_FLUTTER_WINDOW_H_

windows/runner/main.cpp

@@ -0,0 +1,43 @@
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+#include <windows.h>
+
+#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<std::string> 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(1280, 720);
+  if (!window.CreateAndShow(L"toolbox", origin, size)) {
+    return EXIT_FAILURE;
+  }
+  window.SetQuitOnClose(true);
+
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+
+  ::CoUninitialize();
+  return EXIT_SUCCESS;
+}

windows/runner/resource.h

@@ -0,0 +1,16 @@
+//{{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

windows/runner/runner.exe.manifest

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>

windows/runner/utils.cpp

@@ -0,0 +1,64 @@
+#include "utils.h"
+
+#include <flutter_windows.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include <iostream>
+
+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<std::string> 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::string>();
+  }
+
+  std::vector<std::string> 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);
+  if (target_length == 0) {
+    return std::string();
+  }
+  std::string utf8_string;
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, utf8_string.data(),
+      target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}

windows/runner/utils.h

@@ -0,0 +1,19 @@
+#ifndef RUNNER_UTILS_H_
+#define RUNNER_UTILS_H_
+
+#include <string>
+#include <vector>
+
+// 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);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
+#endif  // RUNNER_UTILS_H_

windows/runner/win32_window.cpp

@@ -0,0 +1,245 @@
+#include "win32_window.h"
+
+#include <flutter_windows.h>
+
+#include "resource.h"
+
+namespace {
+
+constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
+
+// 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<int>(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<EnableNonClientDpiScaling*>(
+          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 registar 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::CreateAndShow(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<LONG>(origin.x),
+                              static_cast<LONG>(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_VISIBLE,
+      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;
+  }
+
+  return OnCreate();
+}
+
+// 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<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
+
+    auto that = static_cast<Win32Window*>(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<RECT*>(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;
+  }
+
+  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<Win32Window*>(
+      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.
+}

windows/runner/win32_window.h

@@ -0,0 +1,98 @@
+#ifndef RUNNER_WIN32_WINDOW_H_
+#define RUNNER_WIN32_WINDOW_H_
+
+#include <windows.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+// 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 and shows a win32 window with |title| and position and size 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 to will treat the width height passed in to this function
+  // as logical pixels and scale to appropriate for the default monitor. Returns
+  // true if the window was created successfully.
+  bool CreateAndShow(const std::wstring& title,
+                     const Point& origin,
+                     const Size& size);
+
+  // 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
+  // responsponds 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;
+
+  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_