Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2773484
D9298.id31428.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D9298.id31428.diff
View Options
diff --git a/keyserver/src/socket/socket.js b/keyserver/src/socket/socket.js
--- a/keyserver/src/socket/socket.js
+++ b/keyserver/src/socket/socket.js
@@ -260,7 +260,7 @@
handleAsyncPromise(extendCookieLifespan(viewer.cookieID));
}
for (const response of serverResponses) {
- this.sendMessage(response);
+ await this.sendMessage(response);
}
if (clientSocketMessage.type === clientSocketMessageTypes.INITIAL) {
this.onSuccessfulConnection();
@@ -277,7 +277,7 @@
errorMessage.responseTo = responseTo;
}
this.markActivityOccurred();
- this.sendMessage(errorMessage);
+ await this.sendMessage(errorMessage);
return;
}
invariant(clientSocketMessage, 'should be set');
@@ -301,7 +301,7 @@
},
};
}
- this.sendMessage(authErrorMessage);
+ await this.sendMessage(authErrorMessage);
this.ws.close(4100, error.message);
return;
} else if (error.message === 'client_version_unsupported') {
@@ -338,19 +338,19 @@
},
};
}
- this.sendMessage(authErrorMessage);
+ await this.sendMessage(authErrorMessage);
this.ws.close(4101, error.message);
return;
}
if (error.payload) {
- this.sendMessage({
+ await this.sendMessage({
type: serverSocketMessageTypes.ERROR,
responseTo,
message: error.message,
payload: error.payload,
});
} else {
- this.sendMessage({
+ await this.sendMessage({
type: serverSocketMessageTypes.ERROR,
responseTo,
message: error.message,
@@ -379,7 +379,7 @@
}
};
- sendMessage = (message: ServerServerSocketMessage) => {
+ sendMessage = async (message: ServerServerSocketMessage) => {
invariant(
this.ws.readyState > 0,
"shouldn't send message until connection established",
@@ -405,7 +405,7 @@
return;
}
- const compressionResult = compressMessage(stringMessage);
+ const compressionResult = await compressMessage(stringMessage);
if (!compressionResult.compressed) {
this.ws.send(stringMessage);
return;
@@ -870,7 +870,7 @@
});
invariant(checkStateRequest, 'should be set');
- this.sendMessage({
+ await this.sendMessage({
type: serverSocketMessageTypes.REQUESTS,
payload: { serverRequests: [checkStateRequest] },
});
diff --git a/keyserver/src/utils/compress.js b/keyserver/src/utils/compress.js
--- a/keyserver/src/utils/compress.js
+++ b/keyserver/src/utils/compress.js
@@ -1,5 +1,6 @@
// @flow
+import { promisify } from 'util';
import zlib from 'zlib';
import type { CompressedData } from 'lib/types/compression-types.js';
@@ -11,15 +12,17 @@
};
const minimumSizeForCompression = 4096; // bytes
+const brotliCompress = promisify(zlib.brotliCompress);
+
type CompressionResult =
| { +compressed: true, +result: CompressedData }
| { +compressed: false, +result: string };
-function compressMessage(message: string): CompressionResult {
+async function compressMessage(message: string): Promise<CompressionResult> {
const bytesInMessage = new Blob([message]).size;
if (bytesInMessage < minimumSizeForCompression) {
return { compressed: false, result: message };
}
- const brotliResult = zlib.brotliCompressSync(message, brotliOptions);
+ const brotliResult = await brotliCompress(message, brotliOptions);
const base64Encoded = brotliResult.toString('base64');
const result = {
algo: 'brotli+base64',
diff --git a/lib/utils/sequential-promise-resolver.js b/lib/utils/sequential-promise-resolver.js
--- a/lib/utils/sequential-promise-resolver.js
+++ b/lib/utils/sequential-promise-resolver.js
@@ -1,11 +1,11 @@
// @flow
class SequentialPromiseResolver<Result> {
- onResolve: Result => mixed;
+ onResolve: Result => Promise<mixed>;
promises: Array<Promise<?Result>> = [];
currentlySpinning: boolean = false;
- constructor(onResolve: Result => mixed) {
+ constructor(onResolve: Result => Promise<mixed>) {
this.onResolve = onResolve;
}
@@ -24,7 +24,7 @@
while (currentPromise) {
const result = await currentPromise;
if (result) {
- this.onResolve(result);
+ await this.onResolve(result);
}
currentPromise = this.promises.shift();
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Sep 21, 2:22 AM (21 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2156251
Default Alt Text
D9298.id31428.diff (4 KB)
Attached To
Mode
D9298: [keyserver] Use async version of brotliCompress
Attached
Detach File
Event Timeline
Log In to Comment