Skip to content

Commit 47d4741

Browse files
amakeamake
authored
Merge pull request #1 from jerson/feature/sync
feat(sync): Sync API enhancements
2 parents 16e44ec + 7201013 commit 47d4741

File tree

15 files changed

+728
-392
lines changed

15 files changed

+728
-392
lines changed

‎example/ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ EXTERNAL SOURCES:
2020

2121
SPEC CHECKSUMS:
2222
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
23-
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
24-
openpgp: ce9352861c10d155d698d2b3bf78f8b6e04fb43a
23+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
24+
openpgp: 937a8b18f330c97bf3612d6ab4ad5ccd89268e29
2525

2626
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
2727

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

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎example/macos/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
1515

1616
SPEC CHECKSUMS:
1717
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
18-
openpgp: 74f1193a4edb7b732b71576beca8d5bd3783a1b8
18+
openpgp: aa2bcc0718d86e19ef9972022a60c5838750fa9a
1919

2020
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
2121

‎example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎example/macos/Runner/AppDelegate.swift

+4
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

‎example/test/app_test.dart

+37-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,44 @@
1-
import 'package:test/test.dart';
1+
import 'package:flutter/foundation.dart';
22
import 'package:openpgp/openpgp.dart';
3+
import 'package:openpgp/openpgp_sync.dart';
4+
import 'package:test/test.dart';
35

46
void main() {
7+
var keyOptions = KeyOptions()..rsaBits = 2048;
8+
var options = Options()
9+
..email = "[email protected]"
10+
..keyOptions = keyOptions;
11+
512
test('Generate Keypair', () async {
6-
var keyOptions = KeyOptions()..rsaBits = 1024;
7-
var keyPair = await OpenPGP.generate(
8-
options: Options()
9-
..email = "[email protected]"
10-
..keyOptions = keyOptions);
13+
var keyPair = await OpenPGP.generate(options: options);
14+
15+
expect(keyPair, isNotNull, reason: "Key pair generation failed.");
16+
expect(keyPair.publicKey, isNotEmpty,
17+
reason: "Public key should not be empty.");
18+
expect(keyPair.privateKey, isNotEmpty,
19+
reason: "Private key should not be empty.");
20+
});
21+
22+
test('Encrypt/Decrypt', () async {
23+
var keyPair = await OpenPGP.generate(options: options);
24+
25+
var encrypted = await OpenPGP.encrypt("hello", keyPair.publicKey);
26+
var decrypted = await OpenPGP.decrypt(encrypted, keyPair.privateKey, "");
27+
expect(decrypted, equals("hello"));
28+
});
29+
30+
test('Generate Keypair Sync/Compute', () async {
31+
final keyPair = await compute(
32+
(options) => OpenPGPSync.generate(options: options),
33+
options,
34+
);
35+
36+
expect(keyPair, isNotNull, reason: "Key pair generation failed.");
37+
expect(keyPair.publicKey, isNotEmpty,
38+
reason: "Public key should not be empty.");
39+
expect(keyPair.privateKey, isNotEmpty,
40+
reason: "Private key should not be empty.");
41+
1142
print(keyPair.privateKey);
12-
expect(keyPair.publicKey != "", true);
1343
});
1444
}

‎lib/bridge/binding.dart

+73-76
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'dart:async';
2-
import 'dart:ffi' as ffi;
2+
import 'dart:ffi';
33
import 'dart:io' show Platform;
44
import 'dart:io';
55
import 'dart:isolate';
@@ -15,101 +15,98 @@ import 'package:path/path.dart' as Path;
1515
class Binding {
1616
static final String _callFuncName = 'OpenPGPBridgeCall';
1717
static final String _libraryName = 'libopenpgp_bridge';
18-
static final Binding _singleton = Binding._internal();
18+
static final Binding _instance = Binding._internal();
1919

20-
late ffi.DynamicLibrary _library;
20+
late final DynamicLibrary _library;
21+
22+
late final BridgeCallDart _bridgeCall;
2123

2224
factory Binding() {
23-
return _singleton;
25+
return _instance;
2426
}
2527

2628
Binding._internal() {
2729
_library = openLib();
30+
_bridgeCall =
31+
_library.lookupFunction<BridgeCallC, BridgeCallDart>(_callFuncName);
2832
}
2933

30-
static void callBridge(IsolateArguments args) {
31-
var result = Binding().call(args.name, args.payload);
34+
@pragma('vm:entry-point')
35+
static void _callBridge(IsolateArguments args) {
36+
var result = _instance.call(args.name, args.payload);
3237
args.port.send(result);
3338
}
3439

3540
Future<Uint8List> callAsync(String name, Uint8List payload) async {
36-
final port = ReceivePort('${_libraryName}_port');
37-
final args = IsolateArguments(name, payload, port.sendPort);
38-
final completer = new Completer<Uint8List>();
39-
40-
final isolate = await Isolate.spawn(
41-
callBridge,
42-
args,
43-
errorsAreFatal: false,
44-
debugName: '${_libraryName}_isolate',
45-
onError: port.sendPort,
46-
);
47-
48-
port.listen(
49-
(message) async {
50-
if (message is Uint8List) {
51-
completer.complete(message);
52-
} else if (message is List) {
53-
completer.completeError(message.firstOrNull ?? "internal error");
54-
} else {
55-
completer.completeError(message ?? "spawn error");
41+
final port = ReceivePort();
42+
final completer = Completer<Uint8List>();
43+
44+
try {
45+
final isolate = await Isolate.spawn(
46+
_callBridge,
47+
IsolateArguments(name, payload, port.sendPort),
48+
errorsAreFatal: false,
49+
debugName: '${_libraryName}_isolate',
50+
onError: port.sendPort,
51+
);
52+
53+
port.listen((message) {
54+
try {
55+
if (message is Uint8List) {
56+
completer.complete(message);
57+
} else if (message is List && message.isNotEmpty) {
58+
completer.completeError(message.first ?? "internal error");
59+
} else {
60+
completer.completeError("spawn error");
61+
}
62+
} finally {
63+
port.close();
64+
isolate.kill(priority: Isolate.beforeNextEvent);
5665
}
57-
port.close();
58-
},
59-
onDone: () {
60-
isolate.kill(priority: Isolate.beforeNextEvent);
61-
},
62-
);
63-
64-
return completer.future;
66+
});
67+
68+
return completer.future;
69+
} catch (e) {
70+
port.close();
71+
throw OpenPGPException("Failed to start isolate: $e");
72+
}
6573
}
6674

6775
Uint8List call(String name, Uint8List payload) {
68-
final callable = _library
69-
.lookup<ffi.NativeFunction<call_func>>(_callFuncName)
70-
.asFunction<Call>();
76+
if (_bridgeCall == null) {
77+
throw OpenPGPException(
78+
"FFI function ${_callFuncName} is not initialized. Check library loading.");
79+
}
7180

72-
final pointer = malloc<ffi.Uint8>(payload.length);
81+
final namePointer = name.toNativeUtf8();
82+
final payloadPointer = malloc.allocate<Uint8>(payload.length);
83+
payloadPointer.asTypedList(payload.length).setAll(0, payload);
7384

74-
// https://github.com/dart-lang/ffi/issues/27
75-
// https://github.com/objectbox/objectbox-dart/issues/69
76-
for (var i = 0; i < payload.length; i++) {
77-
pointer[i] = payload[i];
85+
final result =
86+
_bridgeCall(namePointer, payloadPointer.cast<Void>(), payload.length);
87+
if (result.address == 0) {
88+
throw OpenPGPException(
89+
"FFI function ${_callFuncName} returned null pointer. Check openpgp-mobile implementation.");
7890
}
79-
final payloadPointer = pointer.cast<ffi.Void>();
80-
final namePointer = toUtf8(name);
81-
82-
final result = callable(namePointer, payloadPointer, payload.length);
8391

8492
malloc.free(namePointer);
85-
malloc.free(pointer);
86-
87-
handleError(result.ref.error, result);
93+
malloc.free(payloadPointer);
8894

89-
final output =
90-
result.ref.message.cast<ffi.Uint8>().asTypedList(result.ref.size);
95+
handleError(result.ref.errorMessage, result);
96+
final output = result.ref.toUint8List();
9197
freeResult(result);
98+
9299
return output;
93100
}
94101

95-
void handleError(
96-
ffi.Pointer<Utf8> error, ffi.Pointer<FFIBytesReturn> result) {
97-
if (error.address != ffi.nullptr.address) {
98-
var message = fromUtf8(error);
102+
void handleError(String? error, Pointer<BytesReturn> result) {
103+
if (error != null && error.isNotEmpty) {
99104
freeResult(result);
100-
throw new OpenPGPException(message);
105+
throw OpenPGPException(error);
101106
}
102107
}
103108

104-
ffi.Pointer<Utf8> toUtf8(String? text) {
105-
return text == null ? "".toNativeUtf8() : text.toNativeUtf8();
106-
}
107-
108-
String fromUtf8(ffi.Pointer<Utf8>? text) {
109-
return text == null ? "" : text.toDartString();
110-
}
111-
112-
void freeResult(ffi.Pointer<FFIBytesReturn> result) {
109+
void freeResult(Pointer<BytesReturn> result) {
113110
if (!Platform.isWindows) {
114111
malloc.free(result);
115112
}
@@ -143,7 +140,7 @@ class Binding {
143140
}
144141
}
145142

146-
ffi.DynamicLibrary openLib() {
143+
DynamicLibrary openLib() {
147144
var isFlutterTest = Platform.environment.containsKey('FLUTTER_TEST');
148145

149146
if (Platform.isMacOS || Platform.isIOS) {
@@ -153,13 +150,13 @@ class Binding {
153150
var ffiFile = Path.join(
154151
appDirectory.path, "Contents", "Frameworks", "$_libraryName.dylib");
155152
validateTestFFIFile(ffiFile);
156-
return ffi.DynamicLibrary.open(ffiFile);
153+
return DynamicLibrary.open(ffiFile);
157154
}
158155
if (Platform.isMacOS) {
159-
return ffi.DynamicLibrary.open("$_libraryName.dylib");
156+
return DynamicLibrary.open("$_libraryName.dylib");
160157
}
161158
if (Platform.isIOS) {
162-
return ffi.DynamicLibrary.process();
159+
return DynamicLibrary.process();
163160
}
164161
}
165162

@@ -170,24 +167,24 @@ class Binding {
170167

171168
var ffiFile = 'build/linux/$arch/debug/bundle/lib/$_libraryName.so';
172169
validateTestFFIFile(ffiFile);
173-
return ffi.DynamicLibrary.open(ffiFile);
170+
return DynamicLibrary.open(ffiFile);
174171
}
175172

176173
if (Platform.isLinux) {
177174
try {
178-
return ffi.DynamicLibrary.open("$_libraryName.so");
175+
return DynamicLibrary.open("$_libraryName.so");
179176
} catch (e) {
180177
print(e);
181178
var binary = File("/proc/self/cmdline").readAsStringSync();
182179
var suggestedFile =
183180
Path.join(Path.dirname(binary), "lib", "$_libraryName.so");
184-
return ffi.DynamicLibrary.open(suggestedFile);
181+
return DynamicLibrary.open(suggestedFile);
185182
}
186183
}
187184

188185
if (Platform.isAndroid) {
189186
try {
190-
return ffi.DynamicLibrary.open("$_libraryName.so");
187+
return DynamicLibrary.open("$_libraryName.so");
191188
} catch (e) {
192189
print("fallback to open DynamicLibrary on older devices");
193190
//fallback for devices that cannot load dynamic libraries by name: load the library with an absolute path
@@ -198,7 +195,7 @@ class Binding {
198195
appid = String.fromCharCodes(
199196
appid.codeUnits.where((element) => element != 0));
200197
final loadPath = "/data/data/$appid/lib/$_libraryName.so";
201-
return ffi.DynamicLibrary.open(loadPath);
198+
return DynamicLibrary.open(loadPath);
202199
}
203200
}
204201
}
@@ -211,9 +208,9 @@ class Binding {
211208
var ffiFile = Path.canonicalize(Path.join(
212209
r'build\windows', arch, r'runner\Debug', '$_libraryName.dll'));
213210
validateTestFFIFile(ffiFile);
214-
return ffi.DynamicLibrary.open(ffiFile);
211+
return DynamicLibrary.open(ffiFile);
215212
}
216-
return ffi.DynamicLibrary.open("$_libraryName.dll");
213+
return DynamicLibrary.open("$_libraryName.dll");
217214
}
218215

219216
throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}');

‎lib/bridge/binding_stub.dart

+7-14
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@ import 'dart:async';
22
import 'dart:typed_data';
33

44
class Binding {
5-
static final Binding _singleton = Binding._internal();
6-
7-
factory Binding() {
8-
return _singleton;
9-
}
5+
static final Binding _instance = Binding._internal();
106

117
Binding._internal();
128

13-
Future<Uint8List> callAsync(String name, Uint8List payload) async {
14-
return Uint8List.fromList(''.codeUnits);
15-
}
9+
factory Binding() => _instance;
10+
11+
Future<Uint8List> callAsync(String name, Uint8List payload) async =>
12+
Uint8List(0);
1613

17-
Uint8List call(String name, Uint8List payload) {
18-
return Uint8List.fromList(''.codeUnits);
19-
}
14+
Uint8List call(String name, Uint8List payload) => Uint8List(0);
2015

21-
bool isSupported() {
22-
return false;
23-
}
16+
bool isSupported() => false;
2417
}

0 commit comments

Comments
 (0)