@sogni-ai/sogni-client 1.0.0-alpha.4 → 1.0.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/CHANGELOG.md +13 -0
- package/dist/Account/CurrentAccount.d.ts +5 -4
- package/dist/Account/CurrentAccount.js +29 -9
- package/dist/Account/CurrentAccount.js.map +1 -1
- package/dist/Account/index.d.ts +3 -5
- package/dist/Account/index.js +9 -20
- package/dist/Account/index.js.map +1 -1
- package/dist/Account/types.d.ts +0 -2
- package/dist/ApiClient/WebSocketClient/index.d.ts +4 -4
- package/dist/ApiClient/WebSocketClient/index.js +49 -33
- package/dist/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist/ApiClient/index.d.ts +10 -4
- package/dist/ApiClient/index.js +17 -26
- package/dist/ApiClient/index.js.map +1 -1
- package/dist/Projects/createJobRequestMessage.js +1 -1
- package/dist/Projects/createJobRequestMessage.js.map +1 -1
- package/dist/Projects/index.d.ts +2 -33
- package/dist/Projects/index.js +14 -114
- package/dist/Projects/index.js.map +1 -1
- package/dist/Projects/models.json +8906 -0
- package/dist/Projects/types/index.d.ts +0 -32
- package/dist/lib/RestClient.d.ts +7 -4
- package/dist/lib/RestClient.js +7 -7
- package/dist/lib/RestClient.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +6 -1
- package/src/Account/CurrentAccount.ts +33 -12
- package/src/Account/index.ts +8 -18
- package/src/Account/types.ts +0 -2
- package/src/ApiClient/WebSocketClient/index.ts +25 -16
- package/src/ApiClient/index.ts +27 -19
- package/src/Projects/createJobRequestMessage.ts +1 -2
- package/src/Projects/index.ts +8 -118
- package/src/Projects/models.json +8906 -0
- package/src/Projects/types/index.ts +0 -34
- package/src/lib/RestClient.ts +13 -8
- package/src/version.ts +1 -1
- package/dist/lib/AuthManager.d.ts +0 -51
- package/dist/lib/AuthManager.js +0 -157
- package/dist/lib/AuthManager.js.map +0 -1
- package/dist/lib/Cache.d.ts +0 -9
- package/dist/lib/Cache.js +0 -30
- package/dist/lib/Cache.js.map +0 -1
- package/dist/lib/utils.d.ts +0 -8
- package/dist/lib/utils.js +0 -20
- package/dist/lib/utils.js.map +0 -1
- package/src/lib/AuthManager.ts +0 -172
- package/src/lib/Cache.ts +0 -36
- package/src/lib/utils.ts +0 -17
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
## [1.0.1](https://github.com/Sogni-AI/sogni-client/compare/v1.0.0...v1.0.1) (2025-01-29)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Fix semantic-release gitnub plugin configuration ([0e298b9](https://github.com/Sogni-AI/sogni-client/commit/0e298b9bb105a3b846f0c696be2147072b7097eb))
|
|
7
|
+
|
|
8
|
+
# 1.0.0 (2025-01-29)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* Add semantic-release ([54587c5](https://github.com/Sogni-AI/sogni-client/commit/54587c52c4a5c5d46ce111f625119087b06606e1))
|
|
@@ -5,6 +5,7 @@ import { SupernetType } from '../ApiClient/WebSocketClient/types';
|
|
|
5
5
|
* @inline
|
|
6
6
|
*/
|
|
7
7
|
export interface AccountData {
|
|
8
|
+
token: string | null;
|
|
8
9
|
/**
|
|
9
10
|
* Current network status:\
|
|
10
11
|
* - `connected` - connected to the socket
|
|
@@ -19,9 +20,8 @@ export interface AccountData {
|
|
|
19
20
|
network: SupernetType | null;
|
|
20
21
|
balance: BalanceData;
|
|
21
22
|
walletAddress?: string;
|
|
23
|
+
expiresAt?: Date;
|
|
22
24
|
username?: string;
|
|
23
|
-
token?: string;
|
|
24
|
-
refreshToken?: string;
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
27
|
* Current account data.
|
|
@@ -29,14 +29,15 @@ export interface AccountData {
|
|
|
29
29
|
*/
|
|
30
30
|
declare class CurrentAccount extends DataEntity<AccountData> {
|
|
31
31
|
constructor(data?: AccountData);
|
|
32
|
+
_update<K extends keyof AccountData>(delta: Partial<AccountData>): void;
|
|
32
33
|
_clear(): void;
|
|
33
34
|
get isAuthenicated(): boolean;
|
|
34
35
|
get networkStatus(): "connected" | "disconnected" | "connecting" | "switching";
|
|
35
36
|
get network(): SupernetType | null;
|
|
36
37
|
get balance(): BalanceData;
|
|
37
38
|
get walletAddress(): string | undefined;
|
|
39
|
+
get expiresAt(): Date | undefined;
|
|
38
40
|
get username(): string | undefined;
|
|
39
|
-
get token(): string |
|
|
40
|
-
get refreshToken(): string | undefined;
|
|
41
|
+
get token(): string | null;
|
|
41
42
|
}
|
|
42
43
|
export default CurrentAccount;
|
|
@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const DataEntity_1 = __importDefault(require("../lib/DataEntity"));
|
|
7
|
+
const jwt_decode_1 = require("jwt-decode");
|
|
7
8
|
function getDefaults() {
|
|
8
9
|
return {
|
|
10
|
+
token: null,
|
|
9
11
|
networkStatus: 'disconnected',
|
|
10
12
|
network: null,
|
|
11
13
|
balance: {
|
|
@@ -13,11 +15,14 @@ function getDefaults() {
|
|
|
13
15
|
debit: '0',
|
|
14
16
|
net: '0',
|
|
15
17
|
settled: '0'
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
function decodeToken(token) {
|
|
22
|
+
const data = (0, jwt_decode_1.jwtDecode)(token);
|
|
23
|
+
return {
|
|
24
|
+
walletAddress: data.addr,
|
|
25
|
+
expiresAt: new Date(data.exp * 1000)
|
|
21
26
|
};
|
|
22
27
|
}
|
|
23
28
|
/**
|
|
@@ -28,11 +33,26 @@ class CurrentAccount extends DataEntity_1.default {
|
|
|
28
33
|
constructor(data) {
|
|
29
34
|
super(data || getDefaults());
|
|
30
35
|
}
|
|
36
|
+
_update(delta) {
|
|
37
|
+
this.data = Object.assign(Object.assign({}, this.data), delta);
|
|
38
|
+
const keys = Object.keys(delta);
|
|
39
|
+
if (delta.hasOwnProperty('token')) {
|
|
40
|
+
if (delta.token) {
|
|
41
|
+
Object.assign(this.data, decodeToken(delta.token));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
delete this.data.walletAddress;
|
|
45
|
+
delete this.data.expiresAt;
|
|
46
|
+
}
|
|
47
|
+
keys.push('walletAddress', 'expiresAt');
|
|
48
|
+
}
|
|
49
|
+
this.emit('updated', keys);
|
|
50
|
+
}
|
|
31
51
|
_clear() {
|
|
32
52
|
this._update(getDefaults());
|
|
33
53
|
}
|
|
34
54
|
get isAuthenicated() {
|
|
35
|
-
return !!this.data.
|
|
55
|
+
return !!this.data.token && !!this.data.expiresAt && this.data.expiresAt > new Date();
|
|
36
56
|
}
|
|
37
57
|
get networkStatus() {
|
|
38
58
|
return this.data.networkStatus;
|
|
@@ -46,15 +66,15 @@ class CurrentAccount extends DataEntity_1.default {
|
|
|
46
66
|
get walletAddress() {
|
|
47
67
|
return this.data.walletAddress;
|
|
48
68
|
}
|
|
69
|
+
get expiresAt() {
|
|
70
|
+
return this.data.expiresAt;
|
|
71
|
+
}
|
|
49
72
|
get username() {
|
|
50
73
|
return this.data.username;
|
|
51
74
|
}
|
|
52
75
|
get token() {
|
|
53
76
|
return this.data.token;
|
|
54
77
|
}
|
|
55
|
-
get refreshToken() {
|
|
56
|
-
return this.data.refreshToken;
|
|
57
|
-
}
|
|
58
78
|
}
|
|
59
79
|
exports.default = CurrentAccount;
|
|
60
80
|
//# sourceMappingURL=CurrentAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CurrentAccount.js","sourceRoot":"","sources":["../../src/Account/CurrentAccount.ts"],"names":[],"mappings":";;;;;AAAA,mEAA2C;
|
|
1
|
+
{"version":3,"file":"CurrentAccount.js","sourceRoot":"","sources":["../../src/Account/CurrentAccount.ts"],"names":[],"mappings":";;;;;AAAA,mEAA2C;AAE3C,2CAAuC;AAyBvC,SAAS,WAAW;IAClB,OAAO;QACL,KAAK,EAAE,IAAI;QACX,aAAa,EAAE,cAAc;QAC7B,OAAO,EAAE,IAAI;QACb,OAAO,EAAE;YACP,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,GAAG;YACV,GAAG,EAAE,GAAG;YACR,OAAO,EAAE,GAAG;SACb;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,cAAe,SAAQ,oBAAuB;IAClD,YAAY,IAAkB;QAC5B,KAAK,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,CAA8B,KAA2B;QAC9D,IAAI,CAAC,IAAI,mCAAQ,IAAI,CAAC,IAAI,GAAM,KAA8B,CAAE,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;gBAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;YAC7B,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IACxF,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IACjC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IACjC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACzB,CAAC;CACF;AAED,kBAAe,cAAc,CAAC"}
|
package/dist/Account/index.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import { Wallet } from 'ethers';
|
|
|
4
4
|
import { ApiReponse } from '../ApiClient';
|
|
5
5
|
import CurrentAccount from './CurrentAccount';
|
|
6
6
|
import { SupernetType } from '../ApiClient/WebSocketClient/types';
|
|
7
|
-
import { Tokens } from '../lib/AuthManager';
|
|
8
7
|
/**
|
|
9
8
|
* Account API methods that let you interact with the user's account.
|
|
10
9
|
* Can be accessed via `client.account`. Look for more samples below.
|
|
@@ -22,7 +21,6 @@ declare class AccountApi extends ApiGroup {
|
|
|
22
21
|
private handleBalanceUpdate;
|
|
23
22
|
private handleServerConnected;
|
|
24
23
|
private handleServerDisconnected;
|
|
25
|
-
private handleAuthUpdated;
|
|
26
24
|
private getNonce;
|
|
27
25
|
/**
|
|
28
26
|
* Create Ethers.js Wallet instance from username and password.
|
|
@@ -51,7 +49,7 @@ declare class AccountApi extends ApiGroup {
|
|
|
51
49
|
*/
|
|
52
50
|
create(username: string, email: string, password: string, subscribe?: boolean, referralCode?: string): Promise<AccountCreateData>;
|
|
53
51
|
/**
|
|
54
|
-
* Restore session with username and
|
|
52
|
+
* Restore session with username and access token.
|
|
55
53
|
*
|
|
56
54
|
* You can save access token that you get from the login method and restore the session with this method.
|
|
57
55
|
*
|
|
@@ -73,9 +71,9 @@ declare class AccountApi extends ApiGroup {
|
|
|
73
71
|
* ```
|
|
74
72
|
*
|
|
75
73
|
* @param username
|
|
76
|
-
* @param
|
|
74
|
+
* @param token
|
|
77
75
|
*/
|
|
78
|
-
setToken(username: string,
|
|
76
|
+
setToken(username: string, token: string): void;
|
|
79
77
|
/**
|
|
80
78
|
* Login with username and password. WebSocket connection is established after successful login.
|
|
81
79
|
*
|
package/dist/Account/index.js
CHANGED
|
@@ -34,7 +34,6 @@ class AccountApi extends ApiGroup_1.default {
|
|
|
34
34
|
this.client.socket.on('balanceUpdate', this.handleBalanceUpdate.bind(this));
|
|
35
35
|
this.client.on('connected', this.handleServerConnected.bind(this));
|
|
36
36
|
this.client.on('disconnected', this.handleServerDisconnected.bind(this));
|
|
37
|
-
this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
|
|
38
37
|
}
|
|
39
38
|
handleBalanceUpdate(data) {
|
|
40
39
|
this.currentAccount._update({ balance: data });
|
|
@@ -48,14 +47,6 @@ class AccountApi extends ApiGroup_1.default {
|
|
|
48
47
|
handleServerDisconnected() {
|
|
49
48
|
this.currentAccount._clear();
|
|
50
49
|
}
|
|
51
|
-
handleAuthUpdated({ refreshToken, token, walletAddress }) {
|
|
52
|
-
if (!refreshToken) {
|
|
53
|
-
this.currentAccount._clear();
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
this.currentAccount._update({ walletAddress, token, refreshToken });
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
50
|
getNonce(walletAddress) {
|
|
60
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
52
|
const res = yield this.client.rest.post('/v1/account/nonce', {
|
|
@@ -108,12 +99,12 @@ class AccountApi extends ApiGroup_1.default {
|
|
|
108
99
|
const signature = yield this.eip712.signTypedData(wallet, 'signup', Object.assign(Object.assign({}, payload), { nonce }));
|
|
109
100
|
const res = yield this.client.rest.post('/v1/account/create', Object.assign(Object.assign({}, payload), { referralCode,
|
|
110
101
|
signature }));
|
|
111
|
-
|
|
102
|
+
this.setToken(username, res.data.token);
|
|
112
103
|
return res.data;
|
|
113
104
|
});
|
|
114
105
|
}
|
|
115
106
|
/**
|
|
116
|
-
* Restore session with username and
|
|
107
|
+
* Restore session with username and access token.
|
|
117
108
|
*
|
|
118
109
|
* You can save access token that you get from the login method and restore the session with this method.
|
|
119
110
|
*
|
|
@@ -135,15 +126,13 @@ class AccountApi extends ApiGroup_1.default {
|
|
|
135
126
|
* ```
|
|
136
127
|
*
|
|
137
128
|
* @param username
|
|
138
|
-
* @param
|
|
129
|
+
* @param token
|
|
139
130
|
*/
|
|
140
|
-
setToken(username,
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
walletAddress: this.client.auth.walletAddress
|
|
146
|
-
});
|
|
131
|
+
setToken(username, token) {
|
|
132
|
+
this.client.authenticate(token);
|
|
133
|
+
this.currentAccount._update({
|
|
134
|
+
token,
|
|
135
|
+
username
|
|
147
136
|
});
|
|
148
137
|
}
|
|
149
138
|
/**
|
|
@@ -170,7 +159,7 @@ class AccountApi extends ApiGroup_1.default {
|
|
|
170
159
|
walletAddress: wallet.address,
|
|
171
160
|
signature
|
|
172
161
|
});
|
|
173
|
-
|
|
162
|
+
this.setToken(username, res.data.token);
|
|
174
163
|
return res.data;
|
|
175
164
|
});
|
|
176
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAWA,2DAAkD;AAClD,mCAA4E;AAC5E,4CAAoD;AACpD,sEAA8C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Account/index.ts"],"names":[],"mappings":"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"}
|
package/dist/Account/types.d.ts
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { MessageType, SocketMessageMap } from './messages';
|
|
2
2
|
import { SocketEventMap } from './events';
|
|
3
|
-
import RestClient from '../../lib/RestClient';
|
|
3
|
+
import RestClient, { AuthData } from '../../lib/RestClient';
|
|
4
4
|
import { SupernetType } from './types';
|
|
5
5
|
import { Logger } from '../../lib/DefaultLogger';
|
|
6
|
-
import AuthManager from '../../lib/AuthManager';
|
|
7
6
|
declare class WebSocketClient extends RestClient<SocketEventMap> {
|
|
8
7
|
appId: string;
|
|
9
8
|
baseUrl: string;
|
|
10
9
|
private socket;
|
|
11
10
|
private _supernetType;
|
|
12
11
|
private _pingInterval;
|
|
13
|
-
constructor(baseUrl: string,
|
|
12
|
+
constructor(baseUrl: string, appId: string, supernetType: SupernetType, logger: Logger);
|
|
13
|
+
set auth(auth: AuthData | null);
|
|
14
14
|
get supernetType(): SupernetType;
|
|
15
15
|
get isConnected(): boolean;
|
|
16
|
-
connect():
|
|
16
|
+
connect(): void;
|
|
17
17
|
disconnect(): void;
|
|
18
18
|
private startPing;
|
|
19
19
|
private stopPing;
|
|
@@ -16,22 +16,39 @@ const RestClient_1 = __importDefault(require("../../lib/RestClient"));
|
|
|
16
16
|
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
17
17
|
const base64_1 = require("../../lib/base64");
|
|
18
18
|
const isNodejs_1 = __importDefault(require("../../lib/isNodejs"));
|
|
19
|
+
const js_cookie_1 = __importDefault(require("js-cookie"));
|
|
19
20
|
const version_1 = require("../../version");
|
|
20
|
-
const PROTOCOL_VERSION = '0.4.3';
|
|
21
21
|
const PING_INTERVAL = 15000;
|
|
22
22
|
class WebSocketClient extends RestClient_1.default {
|
|
23
|
-
constructor(baseUrl,
|
|
23
|
+
constructor(baseUrl, appId, supernetType, logger) {
|
|
24
24
|
const _baseUrl = new URL(baseUrl);
|
|
25
25
|
if (_baseUrl.protocol === 'wss:') {
|
|
26
26
|
_baseUrl.protocol = 'https:';
|
|
27
27
|
}
|
|
28
|
-
super(_baseUrl.toString(),
|
|
28
|
+
super(_baseUrl.toString(), logger);
|
|
29
29
|
this.socket = null;
|
|
30
30
|
this._pingInterval = null;
|
|
31
31
|
this.appId = appId;
|
|
32
32
|
this.baseUrl = _baseUrl.toString();
|
|
33
33
|
this._supernetType = supernetType;
|
|
34
34
|
}
|
|
35
|
+
set auth(auth) {
|
|
36
|
+
//In browser, set the cookie
|
|
37
|
+
if (!isNodejs_1.default) {
|
|
38
|
+
if (auth) {
|
|
39
|
+
js_cookie_1.default.set('authorization', auth.token, {
|
|
40
|
+
domain: '.sogni.ai',
|
|
41
|
+
expires: 1
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
js_cookie_1.default.remove('authorization', {
|
|
46
|
+
domain: '.sogni.ai'
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
this._auth = auth;
|
|
51
|
+
}
|
|
35
52
|
get supernetType() {
|
|
36
53
|
return this._supernetType;
|
|
37
54
|
}
|
|
@@ -39,35 +56,34 @@ class WebSocketClient extends RestClient_1.default {
|
|
|
39
56
|
return !!this.socket;
|
|
40
57
|
}
|
|
41
58
|
connect() {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
});
|
|
59
|
+
var _a;
|
|
60
|
+
if (this.socket) {
|
|
61
|
+
this.disconnect();
|
|
62
|
+
}
|
|
63
|
+
const userAgent = `Sogni/${version_1.LIB_VERSION} (sogni-client)`;
|
|
64
|
+
const url = new URL(this.baseUrl);
|
|
65
|
+
url.protocol = 'wss:';
|
|
66
|
+
url.searchParams.set('appId', this.appId);
|
|
67
|
+
url.searchParams.set('clientName', userAgent);
|
|
68
|
+
url.searchParams.set('clientType', 'artist');
|
|
69
|
+
//At this point 'relaxed' does not work as expected, so we use 'fast' or empty
|
|
70
|
+
url.searchParams.set('forceWorkerId', this._supernetType === 'fast' ? 'fast' : '');
|
|
71
|
+
let params;
|
|
72
|
+
// In Node.js, ws package is used, so we need to set the auth header
|
|
73
|
+
if (isNodejs_1.default) {
|
|
74
|
+
params = {
|
|
75
|
+
headers: {
|
|
76
|
+
Authorization: (_a = this._auth) === null || _a === void 0 ? void 0 : _a.token,
|
|
77
|
+
'User-Agent': userAgent
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
this.socket = new isomorphic_ws_1.default(url.toString(), params);
|
|
82
|
+
this.socket.onerror = this.handleError.bind(this);
|
|
83
|
+
this.socket.onmessage = this.handleMessage.bind(this);
|
|
84
|
+
this.socket.onopen = this.handleOpen.bind(this);
|
|
85
|
+
this.socket.onclose = this.handleClose.bind(this);
|
|
86
|
+
this.startPing(this.socket);
|
|
71
87
|
}
|
|
72
88
|
disconnect() {
|
|
73
89
|
if (!this.socket) {
|
|
@@ -96,7 +112,7 @@ class WebSocketClient extends RestClient_1.default {
|
|
|
96
112
|
}
|
|
97
113
|
}
|
|
98
114
|
switchNetwork(supernetType) {
|
|
99
|
-
return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
|
|
115
|
+
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
100
116
|
this.once('changeNetwork', ({ network }) => {
|
|
101
117
|
this._supernetType = network;
|
|
102
118
|
resolve(network);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ import { ServerConnectData, ServerDisconnectData } from './WebSocketClient/event
|
|
|
6
6
|
import { JSONValue } from '../types/json';
|
|
7
7
|
import { SupernetType } from './WebSocketClient/types';
|
|
8
8
|
import { Logger } from '../lib/DefaultLogger';
|
|
9
|
-
import AuthManager, { Tokens } from '../lib/AuthManager';
|
|
10
9
|
export interface ApiReponse<D = JSONValue> {
|
|
11
10
|
status: 'success';
|
|
12
11
|
data: D;
|
|
@@ -22,6 +21,14 @@ export declare class ApiError extends Error {
|
|
|
22
21
|
payload: ApiErrorResponse;
|
|
23
22
|
constructor(status: number, payload: ApiErrorResponse);
|
|
24
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* @inline
|
|
26
|
+
*/
|
|
27
|
+
interface AuthData {
|
|
28
|
+
token: string;
|
|
29
|
+
walletAddress: string;
|
|
30
|
+
expiresAt: Date;
|
|
31
|
+
}
|
|
25
32
|
declare class ApiClient extends TypedEventEmitter<ApiClientEvents> {
|
|
26
33
|
readonly appId: string;
|
|
27
34
|
readonly logger: Logger;
|
|
@@ -31,13 +38,12 @@ declare class ApiClient extends TypedEventEmitter<ApiClientEvents> {
|
|
|
31
38
|
private _reconnectAttempts;
|
|
32
39
|
constructor(baseUrl: string, socketUrl: string, appId: string, networkType: SupernetType, logger: Logger);
|
|
33
40
|
get isAuthenticated(): boolean;
|
|
34
|
-
get auth():
|
|
41
|
+
get auth(): AuthData | null;
|
|
35
42
|
get socket(): WebSocketClient;
|
|
36
43
|
get rest(): RestClient;
|
|
37
|
-
authenticate(
|
|
44
|
+
authenticate(token: string): void;
|
|
38
45
|
removeAuth(): void;
|
|
39
46
|
handleSocketConnect({ network }: ServerConnectData): void;
|
|
40
47
|
handleSocketDisconnect(data: ServerDisconnectData): void;
|
|
41
|
-
handleRefreshFailed(): void;
|
|
42
48
|
}
|
|
43
49
|
export default ApiClient;
|
package/dist/ApiClient/index.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -15,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
6
|
exports.ApiError = void 0;
|
|
16
7
|
const RestClient_1 = __importDefault(require("../lib/RestClient"));
|
|
17
8
|
const WebSocketClient_1 = __importDefault(require("./WebSocketClient"));
|
|
9
|
+
const jwt_decode_1 = require("jwt-decode");
|
|
18
10
|
const TypedEventEmitter_1 = __importDefault(require("../lib/TypedEventEmitter"));
|
|
19
11
|
const ErrorCode_1 = require("./WebSocketClient/ErrorCode");
|
|
20
|
-
const AuthManager_1 = __importDefault(require("../lib/AuthManager"));
|
|
21
12
|
const WS_RECONNECT_ATTEMPTS = 5;
|
|
22
13
|
class ApiError extends Error {
|
|
23
14
|
constructor(status, payload) {
|
|
@@ -30,21 +21,20 @@ exports.ApiError = ApiError;
|
|
|
30
21
|
class ApiClient extends TypedEventEmitter_1.default {
|
|
31
22
|
constructor(baseUrl, socketUrl, appId, networkType, logger) {
|
|
32
23
|
super();
|
|
24
|
+
this._auth = null;
|
|
33
25
|
this._reconnectAttempts = WS_RECONNECT_ATTEMPTS;
|
|
34
26
|
this.appId = appId;
|
|
35
27
|
this.logger = logger;
|
|
36
|
-
this.
|
|
37
|
-
this.
|
|
38
|
-
this._socket = new WebSocketClient_1.default(socketUrl, this._auth, appId, networkType, logger);
|
|
39
|
-
this._auth.on('refreshFailed', this.handleRefreshFailed.bind(this));
|
|
28
|
+
this._rest = new RestClient_1.default(baseUrl, logger);
|
|
29
|
+
this._socket = new WebSocketClient_1.default(socketUrl, appId, networkType, logger);
|
|
40
30
|
this._socket.on('connected', this.handleSocketConnect.bind(this));
|
|
41
31
|
this._socket.on('disconnected', this.handleSocketDisconnect.bind(this));
|
|
42
32
|
}
|
|
43
33
|
get isAuthenticated() {
|
|
44
|
-
return this.
|
|
34
|
+
return !!this._auth && this._auth.expiresAt > new Date();
|
|
45
35
|
}
|
|
46
36
|
get auth() {
|
|
47
|
-
return this._auth;
|
|
37
|
+
return this._auth && this._auth.expiresAt > new Date() ? this._auth : null;
|
|
48
38
|
}
|
|
49
39
|
get socket() {
|
|
50
40
|
return this._socket;
|
|
@@ -52,14 +42,19 @@ class ApiClient extends TypedEventEmitter_1.default {
|
|
|
52
42
|
get rest() {
|
|
53
43
|
return this._rest;
|
|
54
44
|
}
|
|
55
|
-
authenticate(
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
45
|
+
authenticate(token) {
|
|
46
|
+
const decoded = (0, jwt_decode_1.jwtDecode)(token);
|
|
47
|
+
this._auth = {
|
|
48
|
+
token,
|
|
49
|
+
walletAddress: decoded.addr,
|
|
50
|
+
expiresAt: new Date(decoded.exp * 1000)
|
|
51
|
+
};
|
|
52
|
+
this.rest.auth = { token };
|
|
53
|
+
this.socket.auth = { token };
|
|
54
|
+
this.socket.connect();
|
|
60
55
|
}
|
|
61
56
|
removeAuth() {
|
|
62
|
-
this.
|
|
57
|
+
this._auth = null;
|
|
63
58
|
this.socket.disconnect();
|
|
64
59
|
}
|
|
65
60
|
handleSocketConnect({ network }) {
|
|
@@ -74,7 +69,6 @@ class ApiClient extends TypedEventEmitter_1.default {
|
|
|
74
69
|
return;
|
|
75
70
|
}
|
|
76
71
|
if (this._reconnectAttempts <= 0) {
|
|
77
|
-
this.removeAuth();
|
|
78
72
|
this.emit('disconnected', data);
|
|
79
73
|
this._reconnectAttempts = WS_RECONNECT_ATTEMPTS;
|
|
80
74
|
return;
|
|
@@ -82,9 +76,6 @@ class ApiClient extends TypedEventEmitter_1.default {
|
|
|
82
76
|
this._reconnectAttempts--;
|
|
83
77
|
setTimeout(() => this.socket.connect(), 1000);
|
|
84
78
|
}
|
|
85
|
-
handleRefreshFailed() {
|
|
86
|
-
this.removeAuth();
|
|
87
|
-
}
|
|
88
79
|
}
|
|
89
80
|
exports.default = ApiClient;
|
|
90
81
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ApiClient/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ApiClient/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ function createJobRequestMessage(id, params) {
|
|
|
70
70
|
const jobRequest = Object.assign(Object.assign({}, template), { keyFrames: [
|
|
71
71
|
Object.assign(Object.assign({}, template.keyFrames[0]), { scheduler: params.scheduler, steps: params.steps, guidanceScale: params.guidance, modelID: params.modelId, negativePrompt: params.negativePrompt, seed: params.seed, positivePrompt: params.positivePrompt, stylePrompt: params.stylePrompt, hasStartingImage: !!params.startingImage, strengthIsEnabled: !!params.startingImage, strength: !!params.startingImage
|
|
72
72
|
? 1 - (Number(params.startingImageStrength) || 0.5)
|
|
73
|
-
: undefined
|
|
73
|
+
: undefined })
|
|
74
74
|
], previews: params.numberOfPreviews || 0, numberOfImages: params.numberOfImages, jobID: id, disableSafety: !!params.disableNSFWFilter });
|
|
75
75
|
if (params.network) {
|
|
76
76
|
jobRequest.network = params.network;
|