Skip to content

Commit 792ff3c

Browse files
committed
Rework code for camera-kit-bridge v0.2.0 API
1 parent 2dbb3c1 commit 792ff3c

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

src/utils/creator.js

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import { BridgeError, CameraKitClient, DataMessage, ErrorMessage } from "@ptrumpis/snap-camerakit-bridge";
2-
import * as dotenv from 'dotenv';
1+
import { CameraKitClient } from "@ptrumpis/snap-camerakit-bridge/client";
2+
import { SnapCameraFormatter } from "@ptrumpis/snap-camerakit-bridge/format";
33
import * as Util from './helper.js';
44
import * as Web from './web.js';
55

6-
dotenv.config();
7-
86
const bridgeAddr = process.env.BRIDGE_ADDR;
97
const apiToken = process.env.BRIDGE_API_TOKEN;
108
let isInitialized = false;
119

12-
const client = (bridgeAddr) ? new CameraKitClient(bridgeAddr) : null;
10+
const client = (bridgeAddr) ? new CameraKitClient(bridgeAddr, { formatter: SnapCameraFormatter }) : null;
1311

1412
async function getLensGroup(groupId) {
1513
try {
@@ -21,22 +19,12 @@ async function getLensGroup(groupId) {
2119
throw new Error('You need to edit your .env file and set BRIDGE_API_TOKEN');
2220
}
2321

24-
let message = null;
2522
if (!isInitialized) {
26-
message = await client.init(apiToken);
27-
if (message instanceof ErrorMessage) {
28-
throw BridgeError.fromJSON(message.error);
29-
} else if (message instanceof DataMessage) {
30-
isInitialized = (message.data) ? true : false;
31-
}
23+
isInitialized = await client.init(apiToken) || false;
3224
}
3325

34-
message = await client.getLensGroup(groupId);
35-
if (message instanceof ErrorMessage) {
36-
throw BridgeError.fromJSON(message.error);
37-
} else if (message instanceof DataMessage) {
38-
return await fixLensesForActivation(message.data);
39-
}
26+
const lenses = await client.loadLensGroup(groupId);
27+
return await fixLensesForActivation(lenses);
4028
} catch (e) {
4129
console.error(`[Error] Failed to get lens group: ${e.message}`);
4230
}

0 commit comments

Comments
 (0)