@deepgram/sdk 4.4.0 → 4.5.1
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/README.md +3 -0
- package/dist/main/lib/fetch.d.ts +7 -1
- package/dist/main/lib/fetch.d.ts.map +1 -1
- package/dist/main/lib/fetch.js +2 -2
- package/dist/main/lib/fetch.js.map +1 -1
- package/dist/main/lib/types/DeepgramClientOptions.d.ts +5 -2
- package/dist/main/lib/types/DeepgramClientOptions.d.ts.map +1 -1
- package/dist/main/lib/version.d.ts +1 -1
- package/dist/main/lib/version.js +1 -1
- package/dist/main/packages/AbstractClient.d.ts +2 -1
- package/dist/main/packages/AbstractClient.d.ts.map +1 -1
- package/dist/main/packages/AbstractClient.js +19 -8
- package/dist/main/packages/AbstractClient.js.map +1 -1
- package/dist/main/packages/AbstractLiveClient.d.ts.map +1 -1
- package/dist/main/packages/AbstractLiveClient.js +15 -4
- package/dist/main/packages/AbstractLiveClient.js.map +1 -1
- package/dist/main/packages/AbstractRestClient.d.ts.map +1 -1
- package/dist/main/packages/AbstractRestClient.js +2 -1
- package/dist/main/packages/AbstractRestClient.js.map +1 -1
- package/dist/module/lib/fetch.d.ts +7 -1
- package/dist/module/lib/fetch.d.ts.map +1 -1
- package/dist/module/lib/fetch.js +2 -2
- package/dist/module/lib/fetch.js.map +1 -1
- package/dist/module/lib/types/DeepgramClientOptions.d.ts +5 -2
- package/dist/module/lib/types/DeepgramClientOptions.d.ts.map +1 -1
- package/dist/module/lib/version.d.ts +1 -1
- package/dist/module/lib/version.js +1 -1
- package/dist/module/packages/AbstractClient.d.ts +2 -1
- package/dist/module/packages/AbstractClient.d.ts.map +1 -1
- package/dist/module/packages/AbstractClient.js +19 -8
- package/dist/module/packages/AbstractClient.js.map +1 -1
- package/dist/module/packages/AbstractLiveClient.d.ts.map +1 -1
- package/dist/module/packages/AbstractLiveClient.js +15 -4
- package/dist/module/packages/AbstractLiveClient.js.map +1 -1
- package/dist/module/packages/AbstractRestClient.d.ts.map +1 -1
- package/dist/module/packages/AbstractRestClient.js +2 -1
- package/dist/module/packages/AbstractRestClient.js.map +1 -1
- package/dist/umd/deepgram.js +1 -1
- package/package.json +1 -1
- package/src/lib/fetch.ts +12 -2
- package/src/lib/types/DeepgramClientOptions.ts +5 -2
- package/src/lib/version.ts +1 -1
- package/src/packages/AbstractClient.ts +18 -10
- package/src/packages/AbstractLiveClient.ts +19 -4
- package/src/packages/AbstractRestClient.ts +3 -1
package/README.md
CHANGED
|
@@ -683,8 +683,11 @@ Creates a temporary token with a 30-second TTL.
|
|
|
683
683
|
|
|
684
684
|
```js
|
|
685
685
|
const { result, error } = await deepgram.auth.grantToken();
|
|
686
|
+
const deepgramWithToken = createClient({ accessToken: result.access_token });
|
|
686
687
|
```
|
|
687
688
|
|
|
689
|
+
This example shows how to use the temporary token to authenticate a client instance. Note that you _must_ pass an `accessToken` property to use a temporary token. Passing the token as a raw string will error, as the SDK will treat it as an API key and use the incorrect header prefix.
|
|
690
|
+
|
|
688
691
|
[See our API reference for more info](https://developers.deepgram.com/reference/token-based-auth-api/grant-token).
|
|
689
692
|
|
|
690
693
|
## Projects
|
package/dist/main/lib/fetch.d.ts
CHANGED
|
@@ -6,6 +6,11 @@ import type { Fetch } from "./types";
|
|
|
6
6
|
* @returns A fetch function that can be used to make HTTP requests.
|
|
7
7
|
*/
|
|
8
8
|
export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
|
|
9
|
+
interface FetchWithAuthOptions {
|
|
10
|
+
apiKey?: string;
|
|
11
|
+
customFetch?: Fetch;
|
|
12
|
+
accessToken?: string;
|
|
13
|
+
}
|
|
9
14
|
/**
|
|
10
15
|
* Resolves a fetch function that includes an "Authorization" header with the provided API key.
|
|
11
16
|
*
|
|
@@ -13,7 +18,7 @@ export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
|
|
|
13
18
|
* @param customFetch - An optional custom fetch function to use instead of the global fetch function.
|
|
14
19
|
* @returns A fetch function that can be used to make HTTP requests with the provided API key in the "Authorization" header.
|
|
15
20
|
*/
|
|
16
|
-
export declare const fetchWithAuth: (apiKey
|
|
21
|
+
export declare const fetchWithAuth: ({ apiKey, customFetch, accessToken, }: Readonly<FetchWithAuthOptions>) => Fetch;
|
|
17
22
|
/**
|
|
18
23
|
* Resolves the appropriate Response object to use, either the global Response object if available, or the Response object from the cross-fetch library if the global Response object is not available.
|
|
19
24
|
*
|
|
@@ -25,4 +30,5 @@ export declare const resolveResponse: () => Promise<{
|
|
|
25
30
|
error(): Response;
|
|
26
31
|
redirect(url: string | URL, status?: number | undefined): Response;
|
|
27
32
|
}>;
|
|
33
|
+
export {};
|
|
28
34
|
//# sourceMappingURL=fetch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,iBAAkB,KAAK,KAAG,KAYlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,iBAAkB,KAAK,KAAG,KAYlD,CAAC;AAEF,UAAU,oBAAoB;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,0CAIvB,SAAS,oBAAoB,CAAC,KAAG,KAanC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;EAM3B,CAAC"}
|
package/dist/main/lib/fetch.js
CHANGED
|
@@ -65,13 +65,13 @@ exports.resolveFetch = resolveFetch;
|
|
|
65
65
|
* @param customFetch - An optional custom fetch function to use instead of the global fetch function.
|
|
66
66
|
* @returns A fetch function that can be used to make HTTP requests with the provided API key in the "Authorization" header.
|
|
67
67
|
*/
|
|
68
|
-
const fetchWithAuth = (apiKey, customFetch) => {
|
|
68
|
+
const fetchWithAuth = ({ apiKey, customFetch, accessToken, }) => {
|
|
69
69
|
const fetch = (0, exports.resolveFetch)(customFetch);
|
|
70
70
|
const HeadersConstructor = (0, helpers_1.resolveHeadersConstructor)();
|
|
71
71
|
return (input, init) => __awaiter(void 0, void 0, void 0, function* () {
|
|
72
72
|
const headers = new HeadersConstructor(init === null || init === void 0 ? void 0 : init.headers);
|
|
73
73
|
if (!headers.has("Authorization")) {
|
|
74
|
-
headers.set("Authorization", `Token ${apiKey}`);
|
|
74
|
+
headers.set("Authorization", accessToken ? `Bearer ${accessToken}` : `Token ${apiKey}`);
|
|
75
75
|
}
|
|
76
76
|
return fetch(input, Object.assign(Object.assign({}, init), { headers }));
|
|
77
77
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsD;AACtD,8DAAqC;AAGrC;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAS,EAAE;IACzD,IAAI,MAAa,CAAC;IAElB,IAAI,WAAW,EAAE;QACf,MAAM,GAAG,WAAW,CAAC;KACtB;SAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACvC,MAAM,GAAG,qBAA8B,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsD;AACtD,8DAAqC;AAGrC;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAS,EAAE;IACzD,IAAI,MAAa,CAAC;IAElB,IAAI,WAAW,EAAE;QACf,MAAM,GAAG,WAAW,CAAC;KACtB;SAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACvC,MAAM,GAAG,qBAA8B,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;AAQF;;;;;;GAMG;AACI,MAAM,aAAa,GAAG,CAAC,EAC5B,MAAM,EACN,WAAW,EACX,WAAW,GACoB,EAAS,EAAE;IAC1C,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,WAAW,CAAC,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAA,mCAAyB,GAAE,CAAC;IAEvD,OAAO,CAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;SACzF;QAED,OAAO,KAAK,CAAC,KAAK,kCAAO,IAAI,KAAE,OAAO,IAAG,CAAC;IAC5C,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,aAAa,iBAiBxB;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,GAAS,EAAE;IACxC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;QACnC,OAAO,CAAC,wDAAa,aAAa,GAAC,CAAC,CAAC,QAAQ,CAAC;KAC/C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AANW,QAAA,eAAe,mBAM1B"}
|
|
@@ -21,7 +21,8 @@ interface ITransport<C, O> {
|
|
|
21
21
|
options?: O;
|
|
22
22
|
}
|
|
23
23
|
export declare type DefaultNamespaceOptions = {
|
|
24
|
-
key
|
|
24
|
+
key?: string | IKeyFactory;
|
|
25
|
+
accessToken?: string | IKeyFactory;
|
|
25
26
|
fetch: {
|
|
26
27
|
options: {
|
|
27
28
|
url: TransportUrl;
|
|
@@ -34,7 +35,8 @@ export declare type DefaultNamespaceOptions = {
|
|
|
34
35
|
};
|
|
35
36
|
} & NamespaceOptions;
|
|
36
37
|
export interface NamespaceOptions {
|
|
37
|
-
key?: string;
|
|
38
|
+
key?: string | IKeyFactory;
|
|
39
|
+
accessToken?: string | IKeyFactory;
|
|
38
40
|
fetch?: ITransport<IFetch, TransportFetchOptions>;
|
|
39
41
|
websocket?: ITransport<IWebSocket, TransportWebSocketOptions>;
|
|
40
42
|
}
|
|
@@ -56,6 +58,7 @@ export declare type DefaultClientOptions = {
|
|
|
56
58
|
*/
|
|
57
59
|
export interface DeepgramClientOptions {
|
|
58
60
|
key?: string | IKeyFactory;
|
|
61
|
+
accessToken?: string | IKeyFactory;
|
|
59
62
|
global?: NamespaceOptions & {
|
|
60
63
|
url?: string;
|
|
61
64
|
headers?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeepgramClientOptions.d.ts","sourceRoot":"","sources":["../../../../src/lib/types/DeepgramClientOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,oBAAY,WAAW,GAAG,MAAM,MAAM,CAAC;AACvC,oBAAY,MAAM,GAAG,OAAO,KAAK,CAAC;AAClC,oBAAY,UAAU,GAAG,OAAO,SAAS,CAAC;AAE1C,UAAU,qBAAsB,SAAQ,gBAAgB,EAAE,YAAY;CAAG;AACzE,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,gBAAgB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAC7C;AAED,aAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;CACH;AAED,UAAU,UAAU,CAAC,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,oBAAY,uBAAuB,GAAG;IACpC,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"DeepgramClientOptions.d.ts","sourceRoot":"","sources":["../../../../src/lib/types/DeepgramClientOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,oBAAY,WAAW,GAAG,MAAM,MAAM,CAAC;AACvC,oBAAY,MAAM,GAAG,OAAO,KAAK,CAAC;AAClC,oBAAY,UAAU,GAAG,OAAO,SAAS,CAAC;AAE1C,UAAU,qBAAsB,SAAQ,gBAAgB,EAAE,YAAY;CAAG;AACzE,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,gBAAgB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAC7C;AAED,aAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;CACH;AAED,UAAU,UAAU,CAAC,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,oBAAY,uBAAuB,GAAG;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,KAAK,EAAE;QACL,OAAO,EAAE;YAAE,GAAG,EAAE,YAAY,CAAA;SAAE,CAAC;KAChC,CAAC;IACF,SAAS,EAAE;QACT,OAAO,EAAE;YAAE,GAAG,EAAE,YAAY,CAAA;SAAE,CAAC;KAChC,CAAC;CACH,GAAG,gBAAgB,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,KAAK,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAClD,SAAS,CAAC,EAAE,UAAU,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;CAC/D;AAED,oBAAY,oBAAoB,GAAG;IACjC,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAC1C,GAAG,qBAAqB,CAAC;AAE1B;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,MAAM,CAAC,EAAE,gBAAgB,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACjF,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;IAErB;;OAEG;IACH,wBAAwB,CAAC,EAAE,KAAK,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,IAAI,GAAG,MAAM,CAAC;KACpB,CAAC;CACH"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "4.
|
|
1
|
+
export declare const version = "4.5.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/main/lib/version.js
CHANGED
|
@@ -14,7 +14,8 @@ export declare const noop: () => void;
|
|
|
14
14
|
*/
|
|
15
15
|
export declare abstract class AbstractClient extends EventEmitter {
|
|
16
16
|
protected factory: Function | undefined;
|
|
17
|
-
protected key: string;
|
|
17
|
+
protected key: string | undefined;
|
|
18
|
+
protected accessToken: string | undefined;
|
|
18
19
|
protected options: DefaultClientOptions;
|
|
19
20
|
namespace: string;
|
|
20
21
|
version: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,IAAI,YAAW,CAAC;AAE7B;;;;;;;;;GASG;AACH,8BAAsB,cAAe,SAAQ,YAAY;IACvD,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAa;IACpD,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,IAAI,YAAW,CAAC;AAE7B;;;;;;;;;GASG;AACH,8BAAsB,cAAe,SAAQ,YAAY;IACvD,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAa;IACpD,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAa;IAC9C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAa;IACtD,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACjC,SAAS,EAAE,MAAM,CAAY;IAC7B,OAAO,EAAE,MAAM,CAAQ;IACvB,OAAO,EAAE,MAAM,CAAe;IAC9B,MAAM,EAAE,QAAQ,CAAQ;IAE/B;;;;;;;;;OASG;gBACS,OAAO,EAAE,qBAAqB;IAwC1C;;;;;OAKG;IACI,CAAC,CAAC,OAAO,GAAE,MAAa,GAAG,IAAI;IAMtC;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,uBAAuB,CAU9C;IAED;;;;;;;OAOG;IACI,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAA8B,EAC7D,oBAAoB,CAAC,EAAE;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,GAAG;IA4BN;;;;OAIG;IACI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;CAGjD"}
|
|
@@ -31,25 +31,36 @@ class AbstractClient extends events_1.EventEmitter {
|
|
|
31
31
|
constructor(options) {
|
|
32
32
|
super();
|
|
33
33
|
this.factory = undefined;
|
|
34
|
+
this.key = undefined;
|
|
35
|
+
this.accessToken = undefined;
|
|
34
36
|
this.namespace = "global";
|
|
35
37
|
this.version = "v1";
|
|
36
38
|
this.baseUrl = constants_1.DEFAULT_URL;
|
|
37
39
|
this.logger = exports.noop;
|
|
38
|
-
|
|
40
|
+
// run the factory for the access token if it's a function
|
|
41
|
+
if (typeof options.accessToken === "function") {
|
|
42
|
+
this.factory = options.accessToken;
|
|
43
|
+
this.accessToken = this.factory();
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
this.accessToken = options.accessToken;
|
|
47
|
+
}
|
|
48
|
+
// run the factory for the key if it's a function
|
|
39
49
|
if (typeof options.key === "function") {
|
|
40
50
|
this.factory = options.key;
|
|
41
|
-
key = this.factory();
|
|
51
|
+
this.key = this.factory();
|
|
42
52
|
}
|
|
43
53
|
else {
|
|
44
|
-
key = options.key;
|
|
54
|
+
this.key = options.key;
|
|
45
55
|
}
|
|
46
|
-
if
|
|
47
|
-
|
|
56
|
+
// if we still have neither, try to use the DEEPGRAM_API_KEY environment variable
|
|
57
|
+
if (!this.key && !this.accessToken) {
|
|
58
|
+
this.key = process.env.DEEPGRAM_API_KEY;
|
|
48
59
|
}
|
|
49
|
-
if
|
|
50
|
-
|
|
60
|
+
// if we STILL have neither, throw an error
|
|
61
|
+
if (!this.key && !this.accessToken) {
|
|
62
|
+
throw new errors_1.DeepgramError("A deepgram API key or temporary auth token is required.");
|
|
51
63
|
}
|
|
52
|
-
this.key = key;
|
|
53
64
|
options = (0, helpers_1.convertLegacyOptions)(options);
|
|
54
65
|
/**
|
|
55
66
|
* Apply default options.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":";;;AAAA,mCAAsC;AACtC,gDAAgE;AAChE,0CAA8C;AAC9C,4CAAyF;AAQlF,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAAhB,QAAA,IAAI,QAAY;AAE7B;;;;;;;;;GASG;AACH,MAAsB,cAAe,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"AbstractClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractLiveClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAQ,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC;AAGnD;;;;;;;GAOG;AACH,UAAU,wBAAwB;IAChC,KACE,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,CAAC,EAAE,GAAG,EACd,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GACxC,aAAa,CAAC;CAClB;AAED;;;;;GAKG;AACH,aAAK,aAAa,GAAG,SAAS,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAEhE;;GAEG;AACH,aAAK,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAmBtD;;;;;;GAMG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IACtD,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,aAAa,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAM;gBAEvB,OAAO,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"AbstractLiveClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAQ,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC;AAGnD;;;;;;;GAOG;AACH,UAAU,wBAAwB;IAChC,KACE,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,CAAC,EAAE,GAAG,EACd,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GACxC,aAAa,CAAC;CAClB;AAED;;;;;GAKG;AACH,aAAK,aAAa,GAAG,SAAS,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAEhE;;GAEG;AACH,aAAK,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAmBtD;;;;;;GAMG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IACtD,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,aAAa,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAM;gBAEvB,OAAO,EAAE,qBAAqB;IAmC1C;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA8E3E;;;;OAIG;IACI,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAQ;IAEvD;;;;;OAKG;IACI,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAYvD;;;;OAIG;IACI,eAAe,IAAI,gBAAgB;IAa1C;;;;OAIG;IACI,aAAa,IAAI,aAAa;IAIrC;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IA8BhC;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;OAIG;IACH,QAAQ,CAAC,eAAe,IAAI,IAAI;CACjC;AAED,cAAM,gBAAgB;IACpB,UAAU,EAAE,MAAM,CAAiB;IACnC,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,QAAQ,CAAY;IAC7B,OAAO,EAAE,QAAQ,CAAY;IAC7B,SAAS,EAAE,QAAQ,CAAY;IAC/B,MAAM,EAAE,QAAQ,CAAY;IAC5B,UAAU,EAAE,MAAM,CAA4B;IAC9C,IAAI,EAAE,QAAQ,CAAY;IAC1B,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAQ;gBAEpB,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAAE;CAI9E;AAED,OAAO,EAAE,kBAAkB,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -89,7 +89,12 @@ class AbstractLiveClient extends AbstractClient_1.AbstractClient {
|
|
|
89
89
|
this.headers = {};
|
|
90
90
|
}
|
|
91
91
|
if (!("Authorization" in this.headers)) {
|
|
92
|
-
this.
|
|
92
|
+
if (this.accessToken) {
|
|
93
|
+
this.headers["Authorization"] = `Bearer ${this.accessToken}`; // Use token if available
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
this.headers["Authorization"] = `Token ${key}`; // Add default token
|
|
97
|
+
}
|
|
93
98
|
}
|
|
94
99
|
}
|
|
95
100
|
/**
|
|
@@ -105,6 +110,11 @@ class AbstractLiveClient extends AbstractClient_1.AbstractClient {
|
|
|
105
110
|
this.connect(options, endpoint);
|
|
106
111
|
};
|
|
107
112
|
const requestUrl = this.getRequestUrl(endpoint, {}, transcriptionOptions);
|
|
113
|
+
const accessToken = this.accessToken;
|
|
114
|
+
const apiKey = this.key;
|
|
115
|
+
if (!accessToken && !apiKey) {
|
|
116
|
+
throw new Error("No key or access token provided for WebSocket connection.");
|
|
117
|
+
}
|
|
108
118
|
/**
|
|
109
119
|
* Custom websocket transport
|
|
110
120
|
*/
|
|
@@ -112,6 +122,7 @@ class AbstractLiveClient extends AbstractClient_1.AbstractClient {
|
|
|
112
122
|
this.conn = new this.transport(requestUrl, undefined, {
|
|
113
123
|
headers: this.headers,
|
|
114
124
|
});
|
|
125
|
+
this.setupConnection();
|
|
115
126
|
return;
|
|
116
127
|
}
|
|
117
128
|
/**
|
|
@@ -126,15 +137,15 @@ class AbstractLiveClient extends AbstractClient_1.AbstractClient {
|
|
|
126
137
|
headers: this.headers,
|
|
127
138
|
});
|
|
128
139
|
console.log(`Using WS package`);
|
|
129
|
-
this.setupConnection();
|
|
130
140
|
});
|
|
141
|
+
this.setupConnection();
|
|
131
142
|
return;
|
|
132
143
|
}
|
|
133
144
|
/**
|
|
134
145
|
* Native websocket transport (browser)
|
|
135
146
|
*/
|
|
136
147
|
if (NATIVE_WEBSOCKET_AVAILABLE) {
|
|
137
|
-
this.conn = new WebSocket(requestUrl, ["token",
|
|
148
|
+
this.conn = new WebSocket(requestUrl, accessToken ? ["bearer", accessToken] : ["token", apiKey]);
|
|
138
149
|
this.setupConnection();
|
|
139
150
|
return;
|
|
140
151
|
}
|
|
@@ -153,8 +164,8 @@ class AbstractLiveClient extends AbstractClient_1.AbstractClient {
|
|
|
153
164
|
this.conn = new WS(requestUrl, undefined, {
|
|
154
165
|
headers: this.headers,
|
|
155
166
|
});
|
|
156
|
-
this.setupConnection();
|
|
157
167
|
});
|
|
168
|
+
this.setupConnection();
|
|
158
169
|
}
|
|
159
170
|
/**
|
|
160
171
|
* Disconnects the socket from the client.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractLiveClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAwD;AACxD,gDAAmE;AAGnE,4CAAuC;AA+BvC;;;;;GAKG;AACH,iCAAiC;AACjC,gBAAgB;AAChB,qBAAqB;AACrB,kBAAkB;AAClB,IAAI;AAEJ;;GAEG;AACH,MAAM,0BAA0B,GAAG,OAAO,SAAS,KAAK,WAAW,CAAC;AAEpE;;;;;;GAMG;AACH,MAAsB,kBAAmB,SAAQ,+BAAc;IAM7D,YAAY,OAA8B;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QAJV,SAAI,GAAyB,IAAI,CAAC;QAClC,eAAU,GAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractLiveClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractRestClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractRestClient.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAIrD;;;GAGG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IAC7D,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB;;;;;OAKG;gBACS,OAAO,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"AbstractRestClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractRestClient.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAIrD;;;GAGG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IAC7D,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IAEvB;;;;;OAKG;gBACS,OAAO,EAAE,qBAAqB;IAoB1C;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAI5C;;;;;;OAMG;cACa,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI;IAiB3E;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,MAAM,EAAE,iBAAiB,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,YAAY,EACzD,OAAO,CAAC,EAAE,YAAY,GACrB,YAAY;IAiBf;;;;;;;;OAQG;cACa,cAAc,CAC5B,MAAM,EAAE,KAAK,GAAG,QAAQ,EACxB,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,QAAQ,CAAC;cACJ,cAAc,CAC5B,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,EAChC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,QAAQ,CAAC;IAmBpB;;;;;;OAMG;cACa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAInE;;;;;;;OAOG;cACa,IAAI,CAClB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,GAAG,CAAC;IAIf;;;;;;;OAOG;cACa,GAAG,CACjB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,GAAG,CAAC;IAIf;;;;;;;OAOG;cACa,KAAK,CACnB,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAChC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,GAAG,CAAC;IAIf;;;;;;OAMG;cACa,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC;IAItE;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF;AAED,OAAO,EAAE,kBAAkB,IAAI,qBAAqB,EAAE,CAAC"}
|
|
@@ -34,7 +34,8 @@ class AbstractRestClient extends AbstractClient_1.AbstractClient {
|
|
|
34
34
|
if ((0, runtime_1.isBrowser)() && !this.proxy) {
|
|
35
35
|
throw new errors_1.DeepgramError("Due to CORS we are unable to support REST-based API calls to our API from the browser. Please consider using a proxy: https://dpgr.am/js-proxy for more information.");
|
|
36
36
|
}
|
|
37
|
-
|
|
37
|
+
const { accessToken, key: apiKey, fetch: customFetch } = this;
|
|
38
|
+
this.fetch = (0, fetch_1.fetchWithAuth)({ accessToken, apiKey, customFetch });
|
|
38
39
|
if (this.proxy) {
|
|
39
40
|
this.baseUrl = this.namespaceOptions.fetch.options.proxy.url;
|
|
40
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractRestClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractRestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0CAAsF;AAEtF,wCAA8D;AAE9D,qDAAkD;AAElD,4CAA2C;AAC3C,0DAA8B;AAE9B;;;GAGG;AACH,MAAsB,kBAAmB,SAAQ,+BAAc;IAG7D;;;;;OAKG;IACH,YAAY,OAA8B;QACxC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,IAAA,mBAAS,GAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAC9B,MAAM,IAAI,sBAAa,CACrB,sKAAsK,CACvK,CAAC;SACH;QAED,
|
|
1
|
+
{"version":3,"file":"AbstractRestClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractRestClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,11 @@ import type { Fetch } from "./types";
|
|
|
6
6
|
* @returns A fetch function that can be used to make HTTP requests.
|
|
7
7
|
*/
|
|
8
8
|
export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
|
|
9
|
+
interface FetchWithAuthOptions {
|
|
10
|
+
apiKey?: string;
|
|
11
|
+
customFetch?: Fetch;
|
|
12
|
+
accessToken?: string;
|
|
13
|
+
}
|
|
9
14
|
/**
|
|
10
15
|
* Resolves a fetch function that includes an "Authorization" header with the provided API key.
|
|
11
16
|
*
|
|
@@ -13,7 +18,7 @@ export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
|
|
|
13
18
|
* @param customFetch - An optional custom fetch function to use instead of the global fetch function.
|
|
14
19
|
* @returns A fetch function that can be used to make HTTP requests with the provided API key in the "Authorization" header.
|
|
15
20
|
*/
|
|
16
|
-
export declare const fetchWithAuth: (apiKey
|
|
21
|
+
export declare const fetchWithAuth: ({ apiKey, customFetch, accessToken, }: Readonly<FetchWithAuthOptions>) => Fetch;
|
|
17
22
|
/**
|
|
18
23
|
* Resolves the appropriate Response object to use, either the global Response object if available, or the Response object from the cross-fetch library if the global Response object is not available.
|
|
19
24
|
*
|
|
@@ -25,4 +30,5 @@ export declare const resolveResponse: () => Promise<{
|
|
|
25
30
|
error(): Response;
|
|
26
31
|
redirect(url: string | URL, status?: number | undefined): Response;
|
|
27
32
|
}>;
|
|
33
|
+
export {};
|
|
28
34
|
//# sourceMappingURL=fetch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,iBAAkB,KAAK,KAAG,KAYlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,iBAAkB,KAAK,KAAG,KAYlD,CAAC;AAEF,UAAU,oBAAoB;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,0CAIvB,SAAS,oBAAoB,CAAC,KAAG,KAanC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;EAM3B,CAAC"}
|
package/dist/module/lib/fetch.js
CHANGED
|
@@ -35,13 +35,13 @@ export const resolveFetch = (customFetch) => {
|
|
|
35
35
|
* @param customFetch - An optional custom fetch function to use instead of the global fetch function.
|
|
36
36
|
* @returns A fetch function that can be used to make HTTP requests with the provided API key in the "Authorization" header.
|
|
37
37
|
*/
|
|
38
|
-
export const fetchWithAuth = (apiKey, customFetch) => {
|
|
38
|
+
export const fetchWithAuth = ({ apiKey, customFetch, accessToken, }) => {
|
|
39
39
|
const fetch = resolveFetch(customFetch);
|
|
40
40
|
const HeadersConstructor = resolveHeadersConstructor();
|
|
41
41
|
return (input, init) => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
42
|
const headers = new HeadersConstructor(init === null || init === void 0 ? void 0 : init.headers);
|
|
43
43
|
if (!headers.has("Authorization")) {
|
|
44
|
-
headers.set("Authorization", `Token ${apiKey}`);
|
|
44
|
+
headers.set("Authorization", accessToken ? `Bearer ${accessToken}` : `Token ${apiKey}`);
|
|
45
45
|
}
|
|
46
46
|
return fetch(input, Object.assign(Object.assign({}, init), { headers }));
|
|
47
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAS,EAAE;IACzD,IAAI,MAAa,CAAC;IAElB,IAAI,WAAW,EAAE;QACf,MAAM,GAAG,WAAW,CAAC;KACtB;SAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACvC,MAAM,GAAG,UAA8B,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/lib/fetch.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,UAAU,MAAM,aAAa,CAAC;AAGrC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAS,EAAE;IACzD,IAAI,MAAa,CAAC;IAElB,IAAI,WAAW,EAAE;QACf,MAAM,GAAG,WAAW,CAAC;KACtB;SAAM,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACvC,MAAM,GAAG,UAA8B,CAAC;KACzC;SAAM;QACL,MAAM,GAAG,KAAK,CAAC;KAChB;IAED,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAQF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAC5B,MAAM,EACN,WAAW,EACX,WAAW,GACoB,EAAS,EAAE;IAC1C,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,kBAAkB,GAAG,yBAAyB,EAAE,CAAC;IAEvD,OAAO,CAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;SACzF;QAED,OAAO,KAAK,CAAC,KAAK,kCAAO,IAAI,KAAE,OAAO,IAAG,CAAC;IAC5C,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAS,EAAE;IACxC,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;QACnC,OAAO,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;KAC/C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC"}
|
|
@@ -21,7 +21,8 @@ interface ITransport<C, O> {
|
|
|
21
21
|
options?: O;
|
|
22
22
|
}
|
|
23
23
|
export declare type DefaultNamespaceOptions = {
|
|
24
|
-
key
|
|
24
|
+
key?: string | IKeyFactory;
|
|
25
|
+
accessToken?: string | IKeyFactory;
|
|
25
26
|
fetch: {
|
|
26
27
|
options: {
|
|
27
28
|
url: TransportUrl;
|
|
@@ -34,7 +35,8 @@ export declare type DefaultNamespaceOptions = {
|
|
|
34
35
|
};
|
|
35
36
|
} & NamespaceOptions;
|
|
36
37
|
export interface NamespaceOptions {
|
|
37
|
-
key?: string;
|
|
38
|
+
key?: string | IKeyFactory;
|
|
39
|
+
accessToken?: string | IKeyFactory;
|
|
38
40
|
fetch?: ITransport<IFetch, TransportFetchOptions>;
|
|
39
41
|
websocket?: ITransport<IWebSocket, TransportWebSocketOptions>;
|
|
40
42
|
}
|
|
@@ -56,6 +58,7 @@ export declare type DefaultClientOptions = {
|
|
|
56
58
|
*/
|
|
57
59
|
export interface DeepgramClientOptions {
|
|
58
60
|
key?: string | IKeyFactory;
|
|
61
|
+
accessToken?: string | IKeyFactory;
|
|
59
62
|
global?: NamespaceOptions & {
|
|
60
63
|
url?: string;
|
|
61
64
|
headers?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeepgramClientOptions.d.ts","sourceRoot":"","sources":["../../../../src/lib/types/DeepgramClientOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,oBAAY,WAAW,GAAG,MAAM,MAAM,CAAC;AACvC,oBAAY,MAAM,GAAG,OAAO,KAAK,CAAC;AAClC,oBAAY,UAAU,GAAG,OAAO,SAAS,CAAC;AAE1C,UAAU,qBAAsB,SAAQ,gBAAgB,EAAE,YAAY;CAAG;AACzE,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,gBAAgB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAC7C;AAED,aAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;CACH;AAED,UAAU,UAAU,CAAC,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,oBAAY,uBAAuB,GAAG;IACpC,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"DeepgramClientOptions.d.ts","sourceRoot":"","sources":["../../../../src/lib/types/DeepgramClientOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9C,oBAAY,WAAW,GAAG,MAAM,MAAM,CAAC;AACvC,oBAAY,MAAM,GAAG,OAAO,KAAK,CAAC;AAClC,oBAAY,UAAU,GAAG,OAAO,SAAS,CAAC;AAE1C,UAAU,qBAAsB,SAAQ,gBAAgB,EAAE,YAAY;CAAG;AACzE,UAAU,yBAA0B,SAAQ,gBAAgB;IAC1D,gBAAgB,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAC7C;AAED,aAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,YAAY,CAAC;KACnB,CAAC;CACH;AAED,UAAU,UAAU,CAAC,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,oBAAY,uBAAuB,GAAG;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,KAAK,EAAE;QACL,OAAO,EAAE;YAAE,GAAG,EAAE,YAAY,CAAA;SAAE,CAAC;KAChC,CAAC;IACF,SAAS,EAAE;QACT,OAAO,EAAE;YAAE,GAAG,EAAE,YAAY,CAAA;SAAE,CAAC;KAChC,CAAC;CACH,GAAG,gBAAgB,CAAC;AAErB,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,KAAK,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAClD,SAAS,CAAC,EAAE,UAAU,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;CAC/D;AAED,oBAAY,oBAAoB,GAAG;IACjC,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAC1C,GAAG,qBAAqB,CAAC;AAE1B;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,MAAM,CAAC,EAAE,gBAAgB,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAA;KAAE,CAAC;IACjF,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;IAErB;;OAEG;IACH,wBAAwB,CAAC,EAAE,KAAK,CAAC;IAEjC;;OAEG;IACH,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,IAAI,GAAG,MAAM,CAAC;KACpB,CAAC;CACH"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "4.
|
|
1
|
+
export declare const version = "4.5.1";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "4.
|
|
1
|
+
export const version = "4.5.1";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -14,7 +14,8 @@ export declare const noop: () => void;
|
|
|
14
14
|
*/
|
|
15
15
|
export declare abstract class AbstractClient extends EventEmitter {
|
|
16
16
|
protected factory: Function | undefined;
|
|
17
|
-
protected key: string;
|
|
17
|
+
protected key: string | undefined;
|
|
18
|
+
protected accessToken: string | undefined;
|
|
18
19
|
protected options: DefaultClientOptions;
|
|
19
20
|
namespace: string;
|
|
20
21
|
version: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,IAAI,YAAW,CAAC;AAE7B;;;;;;;;;GASG;AACH,8BAAsB,cAAe,SAAQ,YAAY;IACvD,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAa;IACpD,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAEtB,eAAO,MAAM,IAAI,YAAW,CAAC;AAE7B;;;;;;;;;GASG;AACH,8BAAsB,cAAe,SAAQ,YAAY;IACvD,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAa;IACpD,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAa;IAC9C,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAa;IACtD,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACjC,SAAS,EAAE,MAAM,CAAY;IAC7B,OAAO,EAAE,MAAM,CAAQ;IACvB,OAAO,EAAE,MAAM,CAAe;IAC9B,MAAM,EAAE,QAAQ,CAAQ;IAE/B;;;;;;;;;OASG;gBACS,OAAO,EAAE,qBAAqB;IAwC1C;;;;;OAKG;IACI,CAAC,CAAC,OAAO,GAAE,MAAa,GAAG,IAAI;IAMtC;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,uBAAuB,CAU9C;IAED;;;;;;;OAOG;IACI,aAAa,CAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAA8B,EAC7D,oBAAoB,CAAC,EAAE;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,GACA,GAAG;IA4BN;;;;OAIG;IACI,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;CAGjD"}
|
|
@@ -27,25 +27,36 @@ export class AbstractClient extends EventEmitter {
|
|
|
27
27
|
constructor(options) {
|
|
28
28
|
super();
|
|
29
29
|
this.factory = undefined;
|
|
30
|
+
this.key = undefined;
|
|
31
|
+
this.accessToken = undefined;
|
|
30
32
|
this.namespace = "global";
|
|
31
33
|
this.version = "v1";
|
|
32
34
|
this.baseUrl = DEFAULT_URL;
|
|
33
35
|
this.logger = noop;
|
|
34
|
-
|
|
36
|
+
// run the factory for the access token if it's a function
|
|
37
|
+
if (typeof options.accessToken === "function") {
|
|
38
|
+
this.factory = options.accessToken;
|
|
39
|
+
this.accessToken = this.factory();
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
this.accessToken = options.accessToken;
|
|
43
|
+
}
|
|
44
|
+
// run the factory for the key if it's a function
|
|
35
45
|
if (typeof options.key === "function") {
|
|
36
46
|
this.factory = options.key;
|
|
37
|
-
key = this.factory();
|
|
47
|
+
this.key = this.factory();
|
|
38
48
|
}
|
|
39
49
|
else {
|
|
40
|
-
key = options.key;
|
|
50
|
+
this.key = options.key;
|
|
41
51
|
}
|
|
42
|
-
if
|
|
43
|
-
|
|
52
|
+
// if we still have neither, try to use the DEEPGRAM_API_KEY environment variable
|
|
53
|
+
if (!this.key && !this.accessToken) {
|
|
54
|
+
this.key = process.env.DEEPGRAM_API_KEY;
|
|
44
55
|
}
|
|
45
|
-
if
|
|
46
|
-
|
|
56
|
+
// if we STILL have neither, throw an error
|
|
57
|
+
if (!this.key && !this.accessToken) {
|
|
58
|
+
throw new DeepgramError("A deepgram API key or temporary auth token is required.");
|
|
47
59
|
}
|
|
48
|
-
this.key = key;
|
|
49
60
|
options = convertLegacyOptions(options);
|
|
50
61
|
/**
|
|
51
62
|
* Apply default options.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAQzF,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAE7B;;;;;;;;;GASG;AACH,MAAM,OAAgB,cAAe,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"AbstractClient.js","sourceRoot":"","sources":["../../../src/packages/AbstractClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractLiveClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAQ,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC;AAGnD;;;;;;;GAOG;AACH,UAAU,wBAAwB;IAChC,KACE,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,CAAC,EAAE,GAAG,EACd,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GACxC,aAAa,CAAC;CAClB;AAED;;;;;GAKG;AACH,aAAK,aAAa,GAAG,SAAS,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAEhE;;GAEG;AACH,aAAK,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAmBtD;;;;;;GAMG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IACtD,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,aAAa,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAM;gBAEvB,OAAO,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"AbstractLiveClient.d.ts","sourceRoot":"","sources":["../../../src/packages/AbstractLiveClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAQ,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC;AAGnD;;;;;;;GAOG;AACH,UAAU,wBAAwB;IAChC,KACE,OAAO,EAAE,MAAM,GAAG,GAAG,EACrB,QAAQ,CAAC,EAAE,GAAG,EACd,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GACxC,aAAa,CAAC;CAClB;AAED;;;;;GAKG;AACH,aAAK,aAAa,GAAG,SAAS,GAAG,WAAW,GAAG,gBAAgB,CAAC;AAEhE;;GAEG;AACH,aAAK,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;AAmBtD;;;;;;GAMG;AACH,8BAAsB,kBAAmB,SAAQ,cAAc;IACtD,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC,SAAS,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,aAAa,GAAG,IAAI,CAAQ;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAM;gBAEvB,OAAO,EAAE,qBAAqB;IAmC1C;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IA8E3E;;;;OAIG;IACI,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAQ;IAEvD;;;;;OAKG;IACI,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAYvD;;;;OAIG;IACI,eAAe,IAAI,gBAAgB;IAa1C;;;;OAIG;IACI,aAAa,IAAI,aAAa;IAIrC;;OAEG;IACI,WAAW,IAAI,OAAO;IAI7B;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IA8BhC;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;OAIG;IACH,QAAQ,CAAC,eAAe,IAAI,IAAI;CACjC;AAED,cAAM,gBAAgB;IACpB,UAAU,EAAE,MAAM,CAAiB;IACnC,KAAK,EAAE,QAAQ,CAAC;IAChB,OAAO,EAAE,QAAQ,CAAY;IAC7B,OAAO,EAAE,QAAQ,CAAY;IAC7B,SAAS,EAAE,QAAQ,CAAY;IAC/B,MAAM,EAAE,QAAQ,CAAY;IAC5B,UAAU,EAAE,MAAM,CAA4B;IAC9C,IAAI,EAAE,QAAQ,CAAY;IAC1B,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAAQ;gBAEpB,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAA;KAAE;CAI9E;AAED,OAAO,EAAE,kBAAkB,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -63,7 +63,12 @@ export class AbstractLiveClient extends AbstractClient {
|
|
|
63
63
|
this.headers = {};
|
|
64
64
|
}
|
|
65
65
|
if (!("Authorization" in this.headers)) {
|
|
66
|
-
this.
|
|
66
|
+
if (this.accessToken) {
|
|
67
|
+
this.headers["Authorization"] = `Bearer ${this.accessToken}`; // Use token if available
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
this.headers["Authorization"] = `Token ${key}`; // Add default token
|
|
71
|
+
}
|
|
67
72
|
}
|
|
68
73
|
}
|
|
69
74
|
/**
|
|
@@ -79,6 +84,11 @@ export class AbstractLiveClient extends AbstractClient {
|
|
|
79
84
|
this.connect(options, endpoint);
|
|
80
85
|
};
|
|
81
86
|
const requestUrl = this.getRequestUrl(endpoint, {}, transcriptionOptions);
|
|
87
|
+
const accessToken = this.accessToken;
|
|
88
|
+
const apiKey = this.key;
|
|
89
|
+
if (!accessToken && !apiKey) {
|
|
90
|
+
throw new Error("No key or access token provided for WebSocket connection.");
|
|
91
|
+
}
|
|
82
92
|
/**
|
|
83
93
|
* Custom websocket transport
|
|
84
94
|
*/
|
|
@@ -86,6 +96,7 @@ export class AbstractLiveClient extends AbstractClient {
|
|
|
86
96
|
this.conn = new this.transport(requestUrl, undefined, {
|
|
87
97
|
headers: this.headers,
|
|
88
98
|
});
|
|
99
|
+
this.setupConnection();
|
|
89
100
|
return;
|
|
90
101
|
}
|
|
91
102
|
/**
|
|
@@ -100,15 +111,15 @@ export class AbstractLiveClient extends AbstractClient {
|
|
|
100
111
|
headers: this.headers,
|
|
101
112
|
});
|
|
102
113
|
console.log(`Using WS package`);
|
|
103
|
-
this.setupConnection();
|
|
104
114
|
});
|
|
115
|
+
this.setupConnection();
|
|
105
116
|
return;
|
|
106
117
|
}
|
|
107
118
|
/**
|
|
108
119
|
* Native websocket transport (browser)
|
|
109
120
|
*/
|
|
110
121
|
if (NATIVE_WEBSOCKET_AVAILABLE) {
|
|
111
|
-
this.conn = new WebSocket(requestUrl, ["token",
|
|
122
|
+
this.conn = new WebSocket(requestUrl, accessToken ? ["bearer", accessToken] : ["token", apiKey]);
|
|
112
123
|
this.setupConnection();
|
|
113
124
|
return;
|
|
114
125
|
}
|
|
@@ -127,8 +138,8 @@ export class AbstractLiveClient extends AbstractClient {
|
|
|
127
138
|
this.conn = new WS(requestUrl, undefined, {
|
|
128
139
|
headers: this.headers,
|
|
129
140
|
});
|
|
130
|
-
this.setupConnection();
|
|
131
141
|
});
|
|
142
|
+
this.setupConnection();
|
|
132
143
|
}
|
|
133
144
|
/**
|
|
134
145
|
* Disconnects the socket from the client.
|