Skip to content

Update options.dart #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
padit69 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update options.dart #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 26 additions & 37 deletions lib/src/options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ class PusherOptions {
final Duration reconnectGap;

/// The channel decryption handler.
final Map<String, dynamic> Function(
Uint8List sharedSecret,
Map<String, dynamic> data,
)? channelDecryption;
final Map<String, dynamic> Function(Uint8List sharedSecret, Map<String, dynamic> data)? channelDecryption;

const PusherOptions({
required this.key,
Expand Down Expand Up @@ -90,57 +87,49 @@ class PusherOptions {
}
} catch (e) {
dev.log("Invalid host: $host", error: e);
// fallback nếu muốn
hostUri = Uri(
scheme: encrypted ? 'wss' : 'ws',
host: cluster != null ? 'ws-$cluster.pusher.com' : 'ws.pusher.com',
port: encrypted ? wssPort : wsPort,
);
}

return Uri(
scheme: hostUri?.scheme.isNotEmpty == true
? hostUri!.scheme
: (encrypted ? 'wss' : 'ws'),
host: hostUri?.host.isNotEmpty == true
? hostUri!.host
: (cluster != null ? 'ws-$cluster.pusher.com' : 'ws.pusher.com'),
port: hostUri?.port == 0 ? (encrypted ? wssPort : wsPort) : uri.port,
queryParameters: {
...parameters,
if (hostUri?.query.isNotEmpty == true) ...hostUri!.queryParameters,
},
Uri finalUri = Uri(
scheme: hostUri.scheme,
host: hostUri.host,
port: hostUri.hasPort ? hostUri.port : (encrypted ? wssPort : wsPort),
queryParameters: {...parameters, if (hostUri.hasQuery) ...hostUri.queryParameters},
path: '/app/$key',
);
return finalUri;
}

log(String level, [String? channel, String? message]) {
if (enableLogging) {
dev.log([
"[PUSHER_",
if (channel != null) "CHANNEL_",
"$level]",
if (channel != null) "\n channel: $channel",
if (message != null) "\n $message"
].join(""));
dev.log(
[
"[PUSHER_",
if (channel != null) "CHANNEL_",
"$level]",
if (channel != null) "\n channel: $channel",
if (message != null) "\n $message",
].join(""),
);
}
}

ByteList _decodeCipherText(String cipherText) {
Uint8List uint8list = base64Decode(cipherText);
ByteData byteData = ByteData.sublistView(uint8list);
List<int> data = List<int>.generate(
byteData.lengthInBytes, (index) => byteData.getUint8(index));
List<int> data = List<int>.generate(byteData.lengthInBytes, (index) => byteData.getUint8(index));
return ByteList(data);
}

Map<String, dynamic> decryptChannelData(
Uint8List sharedSecret,
Map<String, dynamic> data,
) =>
(channelDecryption ?? defaultChannelDecryptionHandler)(
sharedSecret,
data,
);
Map<String, dynamic> decryptChannelData(Uint8List sharedSecret, Map<String, dynamic> data) =>
(channelDecryption ?? defaultChannelDecryptionHandler)(sharedSecret, data);

Map<String, dynamic> defaultChannelDecryptionHandler(
Uint8List sharedSecret,
Map<String, dynamic> data,
) {
Map<String, dynamic> defaultChannelDecryptionHandler(Uint8List sharedSecret, Map<String, dynamic> data) {
if (!data.containsKey("ciphertext") || !data.containsKey("nonce")) {
throw Exception(
"Unexpected format for encrypted event, expected object with `ciphertext` and `nonce` fields, got: $data",
Expand Down