@makerbi/remodex 1.5.2 → 1.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@makerbi/remodex",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.3",
|
|
4
4
|
"description": "Local bridge between Codex and the Remodex mobile app. Run `remodex up` to start.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
},
|
|
10
10
|
"main": "src/index.js",
|
|
11
11
|
"bin": {
|
|
12
|
-
"remodex": "
|
|
13
|
-
"remodex-jsonl-diagnose": "
|
|
12
|
+
"remodex": "bin/remodex.js",
|
|
13
|
+
"remodex-jsonl-diagnose": "bin/remodex-jsonl-diagnose.js"
|
|
14
14
|
},
|
|
15
15
|
"files": [
|
|
16
16
|
"bin/",
|
|
@@ -255,8 +255,7 @@ function printMacOSBridgeServiceStatus(options = {}) {
|
|
|
255
255
|
|
|
256
256
|
function printMacOSBridgePairingQr({ pairingSession = null, env = process.env, fsImpl = fs } = {}) {
|
|
257
257
|
const nextPairingSession = pairingSession || readPairingSession({ env, fsImpl });
|
|
258
|
-
|
|
259
|
-
if (!pairingPayload) {
|
|
258
|
+
if (!nextPairingSession?.pairingPayload) {
|
|
260
259
|
throw new Error("The macOS bridge service did not publish a pairing payload yet.");
|
|
261
260
|
}
|
|
262
261
|
|
|
@@ -351,7 +350,11 @@ async function waitForFreshPairingSession({
|
|
|
351
350
|
while (Date.now() <= deadline) {
|
|
352
351
|
const pairingSession = readPairingSession({ env, fsImpl });
|
|
353
352
|
const createdAt = Date.parse(pairingSession?.createdAt || "");
|
|
354
|
-
if (
|
|
353
|
+
if (
|
|
354
|
+
pairingSession?.pairingPayload
|
|
355
|
+
&& Number.isFinite(createdAt)
|
|
356
|
+
&& createdAt >= startedAt
|
|
357
|
+
) {
|
|
355
358
|
return pairingSession;
|
|
356
359
|
}
|
|
357
360
|
await sleep(intervalMs);
|
package/src/secure-transport.js
CHANGED
|
@@ -364,7 +364,10 @@ function createBridgeSecureTransport({
|
|
|
364
364
|
pendingHandshake.phoneIdentityPublicKey
|
|
365
365
|
);
|
|
366
366
|
if (previousTrustedPhonePublicKey !== pendingHandshake.phoneIdentityPublicKey) {
|
|
367
|
-
onTrustedPhoneUpdate?.(currentDeviceState
|
|
367
|
+
onTrustedPhoneUpdate?.(currentDeviceState, {
|
|
368
|
+
phoneDeviceId: pendingHandshake.phoneDeviceId,
|
|
369
|
+
phoneIdentityPublicKey: pendingHandshake.phoneIdentityPublicKey,
|
|
370
|
+
});
|
|
368
371
|
}
|
|
369
372
|
}
|
|
370
373
|
if (pendingHandshake.handshakeMode === HANDSHAKE_MODE_QR_BOOTSTRAP) {
|