@sogni-ai/sogni-client 0.0.1 → 0.0.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/dist/Account/CurrentAccount.js +3 -1
- package/dist/Account/CurrentAccount.js.map +1 -1
- package/dist/Account/index.d.ts +2 -2
- package/dist/Account/index.js +2 -2
- package/dist/Account/index.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/index.js +10 -5
- package/dist/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist/ApiGroup.d.ts +2 -1
- package/dist/ApiGroup.js +6 -1
- package/dist/ApiGroup.js.map +1 -1
- package/dist/Projects/Job.d.ts +9 -3
- package/dist/Projects/Job.js +12 -0
- package/dist/Projects/Job.js.map +1 -1
- package/dist/Projects/Project.d.ts +13 -3
- package/dist/Projects/Project.js +26 -3
- package/dist/Projects/Project.js.map +1 -1
- package/dist/Projects/index.d.ts +8 -5
- package/dist/Projects/index.js +134 -105
- package/dist/Projects/index.js.map +1 -1
- package/dist/Projects/types/events.d.ts +56 -0
- package/dist/Projects/types/events.js +3 -0
- package/dist/Projects/types/events.js.map +1 -0
- package/dist/Projects/types/index.d.ts +5 -0
- package/dist/index.d.ts +9 -9
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/Entity.d.ts +11 -4
- package/dist/lib/Entity.js +10 -1
- package/dist/lib/Entity.js.map +1 -1
- package/dist/lib/TypedEventEmitter.d.ts +9 -3
- package/dist/lib/TypedEventEmitter.js +12 -0
- package/dist/lib/TypedEventEmitter.js.map +1 -1
- package/package.json +1 -1
|
@@ -31,6 +31,7 @@ class CurrentAccount extends Entity_1.default {
|
|
|
31
31
|
}
|
|
32
32
|
_update(delta) {
|
|
33
33
|
this.data = Object.assign(Object.assign({}, this.data), delta);
|
|
34
|
+
const keys = Object.keys(delta);
|
|
34
35
|
if (delta.hasOwnProperty('token')) {
|
|
35
36
|
if (delta.token) {
|
|
36
37
|
Object.assign(this.data, decodeToken(delta.token));
|
|
@@ -39,8 +40,9 @@ class CurrentAccount extends Entity_1.default {
|
|
|
39
40
|
delete this.data.walletAddress;
|
|
40
41
|
delete this.data.expiresAt;
|
|
41
42
|
}
|
|
43
|
+
keys.push('walletAddress', 'expiresAt');
|
|
42
44
|
}
|
|
43
|
-
this.emit('updated',
|
|
45
|
+
this.emit('updated', keys);
|
|
44
46
|
}
|
|
45
47
|
_clear() {
|
|
46
48
|
this._update(getDefaults());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CurrentAccount.js","sourceRoot":"","sources":["../../src/Account/CurrentAccount.ts"],"names":[],"mappings":";;;;;AAAA,2DAAmC;AAEnC,2CAAuC;AAavC,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,MAAM,cAAe,SAAQ,gBAAmB;IAC9C,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,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;
|
|
1
|
+
{"version":3,"file":"CurrentAccount.js","sourceRoot":"","sources":["../../src/Account/CurrentAccount.ts"],"names":[],"mappings":";;;;;AAAA,2DAAmC;AAEnC,2CAAuC;AAavC,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,MAAM,cAAe,SAAQ,gBAAmB;IAC9C,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;CACF;AAED,kBAAe,cAAc,CAAC"}
|
package/dist/Account/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Wallet } from 'ethers';
|
|
|
4
4
|
import { ApiReponse } from '../ApiClient/ApiClient';
|
|
5
5
|
import CurrentAccount from './CurrentAccount';
|
|
6
6
|
import { SupernetType } from '../ApiClient/WebSocketClient/types';
|
|
7
|
-
declare class
|
|
7
|
+
declare class AccountApi extends ApiGroup {
|
|
8
8
|
readonly currentAccount: CurrentAccount;
|
|
9
9
|
constructor(config: ApiConfig);
|
|
10
10
|
private handleBalanceUpdate;
|
|
@@ -20,4 +20,4 @@ declare class Account extends ApiGroup {
|
|
|
20
20
|
validateUsername(username: string): Promise<import("../ApiClient/ApiClient").ApiErrorResponse | ApiReponse<undefined>>;
|
|
21
21
|
switchNetwork(network: SupernetType): Promise<void>;
|
|
22
22
|
}
|
|
23
|
-
export default
|
|
23
|
+
export default AccountApi;
|
package/dist/Account/index.js
CHANGED
|
@@ -16,7 +16,7 @@ const ApiGroup_1 = __importDefault(require("../ApiGroup"));
|
|
|
16
16
|
const ethers_1 = require("ethers");
|
|
17
17
|
const ApiClient_1 = require("../ApiClient/ApiClient");
|
|
18
18
|
const CurrentAccount_1 = __importDefault(require("./CurrentAccount"));
|
|
19
|
-
class
|
|
19
|
+
class AccountApi extends ApiGroup_1.default {
|
|
20
20
|
constructor(config) {
|
|
21
21
|
super(config);
|
|
22
22
|
this.currentAccount = new CurrentAccount_1.default();
|
|
@@ -135,5 +135,5 @@ class Account extends ApiGroup_1.default {
|
|
|
135
135
|
});
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
-
exports.default =
|
|
138
|
+
exports.default = AccountApi;
|
|
139
139
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,2DAAkD;AAClD,mCAAqD;AACrD,sDAA8D;AAC9D,sEAA8C;AAG9C,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Account/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,22 +133,27 @@ class WebSocketClient extends RestClient_1.default {
|
|
|
133
133
|
console.error('WebSocket error:', e);
|
|
134
134
|
}
|
|
135
135
|
handleMessage(e) {
|
|
136
|
-
|
|
137
|
-
data
|
|
138
|
-
|
|
136
|
+
let dataPromise;
|
|
137
|
+
// In Node.js, e.data is a Buffer, while in browser it's a Blob
|
|
138
|
+
if (isNodejs_1.default) {
|
|
139
|
+
dataPromise = Promise.resolve(e.data.toString());
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
const data = e.data;
|
|
143
|
+
dataPromise = data.text();
|
|
144
|
+
}
|
|
145
|
+
dataPromise
|
|
139
146
|
.then((str) => {
|
|
140
147
|
const data = JSON.parse(str);
|
|
141
148
|
let payload = null;
|
|
142
149
|
if (data.data) {
|
|
143
150
|
payload = JSON.parse((0, base64_1.base64Decode)(data.data));
|
|
144
151
|
}
|
|
145
|
-
console.log('WebSocket event:', data.type, payload);
|
|
146
152
|
this.emit(data.type, payload);
|
|
147
153
|
})
|
|
148
154
|
.catch((err) => {
|
|
149
155
|
console.error('Failed to parse WebSocket message:', err);
|
|
150
156
|
});
|
|
151
|
-
console.log('WebSocket message:', e);
|
|
152
157
|
}
|
|
153
158
|
send(messageType, data) {
|
|
154
159
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":"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"}
|
package/dist/ApiGroup.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { AbstractProvider } from 'ethers';
|
|
2
2
|
import ApiClient from './ApiClient/ApiClient';
|
|
3
3
|
import EIP712Helper from './lib/EIP712Helper';
|
|
4
|
+
import TypedEventEmitter, { EventMap } from './lib/TypedEventEmitter';
|
|
4
5
|
export interface ApiConfig {
|
|
5
6
|
client: ApiClient;
|
|
6
7
|
provider: AbstractProvider;
|
|
7
8
|
eip712: EIP712Helper;
|
|
8
9
|
}
|
|
9
|
-
declare abstract class ApiGroup {
|
|
10
|
+
declare abstract class ApiGroup<E extends EventMap = {}> extends TypedEventEmitter<E> {
|
|
10
11
|
protected client: ApiClient;
|
|
11
12
|
protected provider: AbstractProvider;
|
|
12
13
|
protected eip712: EIP712Helper;
|
package/dist/ApiGroup.js
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
6
|
+
const TypedEventEmitter_1 = __importDefault(require("./lib/TypedEventEmitter"));
|
|
7
|
+
class ApiGroup extends TypedEventEmitter_1.default {
|
|
4
8
|
constructor(config) {
|
|
9
|
+
super();
|
|
5
10
|
this.client = config.client;
|
|
6
11
|
this.provider = config.provider;
|
|
7
12
|
this.eip712 = config.eip712;
|
package/dist/ApiGroup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiGroup.js","sourceRoot":"","sources":["../src/ApiGroup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ApiGroup.js","sourceRoot":"","sources":["../src/ApiGroup.ts"],"names":[],"mappings":";;;;;AAGA,gFAAsE;AAQtE,MAAe,QAAkC,SAAQ,2BAAoB;IAK3E,YAAY,MAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,QAAQ,CAAC"}
|
package/dist/Projects/Job.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import Entity from '../lib/Entity';
|
|
2
|
-
export type JobStatus = '
|
|
1
|
+
import Entity, { EntityEvents } from '../lib/Entity';
|
|
2
|
+
export type JobStatus = 'pending' | 'initiating' | 'processing' | 'completed' | 'failed';
|
|
3
3
|
export interface JobData {
|
|
4
4
|
id: string;
|
|
5
5
|
status: JobStatus;
|
|
@@ -12,7 +12,12 @@ export interface JobData {
|
|
|
12
12
|
code: number;
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
interface JobEvents extends EntityEvents {
|
|
16
|
+
progress: number;
|
|
17
|
+
completed: string;
|
|
18
|
+
failed: JobData['error'];
|
|
19
|
+
}
|
|
20
|
+
declare class Job extends Entity<JobData, JobEvents> {
|
|
16
21
|
constructor(data: JobData);
|
|
17
22
|
get id(): string;
|
|
18
23
|
get status(): JobStatus;
|
|
@@ -26,5 +31,6 @@ declare class Job extends Entity<JobData> {
|
|
|
26
31
|
message: string;
|
|
27
32
|
code: number;
|
|
28
33
|
} | undefined;
|
|
34
|
+
private handleUpdated;
|
|
29
35
|
}
|
|
30
36
|
export default Job;
|
package/dist/Projects/Job.js
CHANGED
|
@@ -7,6 +7,7 @@ const Entity_1 = __importDefault(require("../lib/Entity"));
|
|
|
7
7
|
class Job extends Entity_1.default {
|
|
8
8
|
constructor(data) {
|
|
9
9
|
super(data);
|
|
10
|
+
this.on('updated', this.handleUpdated.bind(this));
|
|
10
11
|
}
|
|
11
12
|
get id() {
|
|
12
13
|
return this.data.id;
|
|
@@ -35,6 +36,17 @@ class Job extends Entity_1.default {
|
|
|
35
36
|
get error() {
|
|
36
37
|
return this.data.error;
|
|
37
38
|
}
|
|
39
|
+
handleUpdated(keys) {
|
|
40
|
+
if (keys.includes('step') || keys.includes('stepCount')) {
|
|
41
|
+
this.emit('progress', this.progress);
|
|
42
|
+
}
|
|
43
|
+
if (keys.includes('status') && this.status === 'completed') {
|
|
44
|
+
this.emit('completed', this.resultUrl);
|
|
45
|
+
}
|
|
46
|
+
if (keys.includes('status') && this.status === 'failed') {
|
|
47
|
+
this.emit('failed', this.data.error);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
38
50
|
}
|
|
39
51
|
exports.default = Job;
|
|
40
52
|
//# sourceMappingURL=Job.js.map
|
package/dist/Projects/Job.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/Projects/Job.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"Job.js","sourceRoot":"","sources":["../../src/Projects/Job.ts"],"names":[],"mappings":";;;;;AAAA,2DAAqD;AAuBrD,MAAM,GAAI,SAAQ,gBAA0B;IAC1C,YAAY,IAAa;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IACrD,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACzB,CAAC;IAEO,aAAa,CAAC,IAAc;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,SAAU,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;CACF;AAED,kBAAe,GAAG,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import Job, { JobData } from './Job';
|
|
2
|
-
import Entity from '../lib/Entity';
|
|
2
|
+
import Entity, { EntityEvents } from '../lib/Entity';
|
|
3
3
|
import { ProjectParams } from './types';
|
|
4
|
-
export type ProjectStatus = '
|
|
4
|
+
export type ProjectStatus = 'pending' | 'queued' | 'processing' | 'completed' | 'failed';
|
|
5
5
|
interface ProjectData {
|
|
6
6
|
id: string;
|
|
7
|
+
startedAt: Date;
|
|
7
8
|
params: ProjectParams;
|
|
8
9
|
queuePosition: number;
|
|
9
10
|
status: ProjectStatus;
|
|
@@ -15,8 +16,14 @@ interface ProjectData {
|
|
|
15
16
|
interface SerializedProject extends ProjectData {
|
|
16
17
|
jobs: JobData[];
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
+
interface ProjectEvents extends EntityEvents {
|
|
20
|
+
progress: number;
|
|
21
|
+
completed: string[];
|
|
22
|
+
failed: ProjectData['error'];
|
|
23
|
+
}
|
|
24
|
+
declare class Project extends Entity<ProjectData, ProjectEvents> {
|
|
19
25
|
private _jobs;
|
|
26
|
+
private _lastEmitedProgress;
|
|
20
27
|
constructor(data: ProjectParams);
|
|
21
28
|
get id(): string;
|
|
22
29
|
get params(): ProjectParams;
|
|
@@ -24,13 +31,16 @@ declare class Project extends Entity<ProjectData> {
|
|
|
24
31
|
get progress(): number;
|
|
25
32
|
get queuePosition(): number;
|
|
26
33
|
get jobs(): Job[];
|
|
34
|
+
get resultUrls(): string[];
|
|
27
35
|
/**
|
|
28
36
|
* Find a job by id
|
|
29
37
|
* @param id
|
|
30
38
|
*/
|
|
31
39
|
job(id: string): Job | undefined;
|
|
40
|
+
private handleUpdated;
|
|
32
41
|
/**
|
|
33
42
|
* This is internal method to add a job to the project. Do not call this directly.
|
|
43
|
+
* @internal
|
|
34
44
|
* @param data
|
|
35
45
|
*/
|
|
36
46
|
_addJob(data: JobData): Job;
|
package/dist/Projects/Project.js
CHANGED
|
@@ -11,11 +11,14 @@ class Project extends Entity_1.default {
|
|
|
11
11
|
constructor(data) {
|
|
12
12
|
super({
|
|
13
13
|
id: (0, uuid_1.v4)(),
|
|
14
|
+
startedAt: new Date(),
|
|
14
15
|
params: data,
|
|
15
16
|
queuePosition: -1,
|
|
16
|
-
status: '
|
|
17
|
+
status: 'pending'
|
|
17
18
|
});
|
|
18
19
|
this._jobs = [];
|
|
20
|
+
this._lastEmitedProgress = -1;
|
|
21
|
+
this.on('updated', this.handleUpdated.bind(this));
|
|
19
22
|
}
|
|
20
23
|
get id() {
|
|
21
24
|
return this.data.id;
|
|
@@ -32,7 +35,7 @@ class Project extends Entity_1.default {
|
|
|
32
35
|
acc.stepCount += job.stepCount;
|
|
33
36
|
return acc;
|
|
34
37
|
}, { steps: 0, stepCount: 0 });
|
|
35
|
-
return steps / stepCount;
|
|
38
|
+
return Math.round((steps / stepCount) * 100);
|
|
36
39
|
}
|
|
37
40
|
get queuePosition() {
|
|
38
41
|
return this.data.queuePosition;
|
|
@@ -40,6 +43,9 @@ class Project extends Entity_1.default {
|
|
|
40
43
|
get jobs() {
|
|
41
44
|
return this._jobs.slice(0);
|
|
42
45
|
}
|
|
46
|
+
get resultUrls() {
|
|
47
|
+
return this.jobs.map((job) => job.resultUrl).filter((r) => !!r);
|
|
48
|
+
}
|
|
43
49
|
/**
|
|
44
50
|
* Find a job by id
|
|
45
51
|
* @param id
|
|
@@ -47,15 +53,32 @@ class Project extends Entity_1.default {
|
|
|
47
53
|
job(id) {
|
|
48
54
|
return this._jobs.find((job) => job.id === id);
|
|
49
55
|
}
|
|
56
|
+
handleUpdated(keys) {
|
|
57
|
+
const progress = this.progress;
|
|
58
|
+
if (progress !== this._lastEmitedProgress) {
|
|
59
|
+
this.emit('progress', progress);
|
|
60
|
+
this._lastEmitedProgress = progress;
|
|
61
|
+
}
|
|
62
|
+
if (keys.includes('status') || keys.includes('jobs')) {
|
|
63
|
+
const allJobsDone = this.jobs.every((job) => job.status === 'completed' || job.status === 'failed');
|
|
64
|
+
if (this.data.status === 'completed' && allJobsDone) {
|
|
65
|
+
return this.emit('completed', this.resultUrls);
|
|
66
|
+
}
|
|
67
|
+
if (this.data.status === 'failed') {
|
|
68
|
+
this.emit('failed', this.data.error);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
50
72
|
/**
|
|
51
73
|
* This is internal method to add a job to the project. Do not call this directly.
|
|
74
|
+
* @internal
|
|
52
75
|
* @param data
|
|
53
76
|
*/
|
|
54
77
|
_addJob(data) {
|
|
55
78
|
const job = new Job_1.default(data);
|
|
56
79
|
this._jobs.push(job);
|
|
57
80
|
job.on('updated', () => {
|
|
58
|
-
this.emit('updated',
|
|
81
|
+
this.emit('updated', ['jobs']);
|
|
59
82
|
});
|
|
60
83
|
return job;
|
|
61
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/Projects/Project.ts"],"names":[],"mappings":";;;;;AAAA,gDAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/Projects/Project.ts"],"names":[],"mappings":"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"}
|
package/dist/Projects/index.d.ts
CHANGED
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import ApiGroup, { ApiConfig } from '../ApiGroup';
|
|
2
|
-
import { EstimateRequest, ImageUrlParams, ProjectParams } from './types';
|
|
3
|
-
import AvailableModels from './AvailableModels';
|
|
2
|
+
import { AvailableModel, EstimateRequest, ImageUrlParams, ProjectParams } from './types';
|
|
4
3
|
import Project from './Project';
|
|
5
|
-
|
|
6
|
-
|
|
4
|
+
import { JobEvent, ProjectApiEvents, ProjectEvent } from './types/events';
|
|
5
|
+
declare class ProjectsApi extends ApiGroup<ProjectApiEvents> {
|
|
6
|
+
private _availableModels;
|
|
7
7
|
private projects;
|
|
8
|
+
get availableModels(): AvailableModel[];
|
|
8
9
|
constructor(config: ApiConfig);
|
|
9
10
|
private handleSwarmModels;
|
|
10
11
|
private handleJobState;
|
|
11
12
|
private handleJobProgress;
|
|
12
13
|
private handleJobResult;
|
|
13
14
|
private handleJobError;
|
|
15
|
+
handleProjectEvent(event: ProjectEvent): void;
|
|
16
|
+
handleJobEvent(event: JobEvent): void;
|
|
14
17
|
private handleServerDisconnected;
|
|
15
18
|
/**
|
|
16
19
|
* Send new project request to the network. Returns project instance which can be used to track
|
|
@@ -35,4 +38,4 @@ declare class Projects extends ApiGroup {
|
|
|
35
38
|
uploadUrl(params: ImageUrlParams): Promise<string>;
|
|
36
39
|
downloadUrl(params: ImageUrlParams): Promise<string>;
|
|
37
40
|
}
|
|
38
|
-
export default
|
|
41
|
+
export default ProjectsApi;
|
package/dist/Projects/index.js
CHANGED
|
@@ -14,133 +14,108 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const ApiGroup_1 = __importDefault(require("../ApiGroup"));
|
|
16
16
|
const models_json_1 = __importDefault(require("./models.json"));
|
|
17
|
-
const AvailableModels_1 = __importDefault(require("./AvailableModels"));
|
|
18
17
|
const Project_1 = __importDefault(require("./Project"));
|
|
19
18
|
const createJobRequestMessage_1 = __importDefault(require("./createJobRequestMessage"));
|
|
20
|
-
class
|
|
19
|
+
class ProjectsApi extends ApiGroup_1.default {
|
|
20
|
+
get availableModels() {
|
|
21
|
+
return this._availableModels;
|
|
22
|
+
}
|
|
21
23
|
constructor(config) {
|
|
22
24
|
super(config);
|
|
23
|
-
this.
|
|
25
|
+
this._availableModels = [];
|
|
24
26
|
this.projects = [];
|
|
27
|
+
// Listen to server events and emit them as project and job events
|
|
25
28
|
this.client.socket.on('swarmModels', this.handleSwarmModels.bind(this));
|
|
26
29
|
this.client.socket.on('jobState', this.handleJobState.bind(this));
|
|
27
30
|
this.client.socket.on('jobProgress', this.handleJobProgress.bind(this));
|
|
28
31
|
this.client.socket.on('jobError', this.handleJobError.bind(this));
|
|
29
32
|
this.client.socket.on('jobResult', this.handleJobResult.bind(this));
|
|
33
|
+
// Listen to server disconnect event
|
|
30
34
|
this.client.on('disconnected', this.handleServerDisconnected.bind(this));
|
|
35
|
+
// Listen to project and job events and update project and job instances
|
|
36
|
+
this.on('project', this.handleProjectEvent.bind(this));
|
|
37
|
+
this.on('job', this.handleJobEvent.bind(this));
|
|
31
38
|
}
|
|
32
39
|
handleSwarmModels(data) {
|
|
33
|
-
|
|
40
|
+
this._availableModels = models_json_1.default.reduce((acc, model) => {
|
|
34
41
|
if (data[model.modelId]) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
42
|
+
acc.push({
|
|
43
|
+
id: model.modelId,
|
|
44
|
+
name: model.modelShortName,
|
|
45
|
+
workerCount: data[model.modelId]
|
|
46
|
+
});
|
|
38
47
|
}
|
|
39
48
|
return acc;
|
|
40
|
-
},
|
|
41
|
-
this.
|
|
49
|
+
}, []);
|
|
50
|
+
this.emit('availableModels', this._availableModels);
|
|
42
51
|
}
|
|
43
52
|
handleJobState(data) {
|
|
44
|
-
const project = this.projects.find((p) => p.id === data.jobID);
|
|
45
|
-
if (!project) {
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
53
|
switch (data.type) {
|
|
49
54
|
case 'queued':
|
|
50
|
-
|
|
51
|
-
|
|
55
|
+
this.emit('project', {
|
|
56
|
+
type: 'queued',
|
|
57
|
+
projectId: data.jobID,
|
|
52
58
|
queuePosition: data.queuePosition
|
|
53
59
|
});
|
|
54
|
-
|
|
60
|
+
return;
|
|
55
61
|
case 'jobCompleted':
|
|
56
|
-
|
|
57
|
-
|
|
62
|
+
this.emit('project', { type: 'completed', projectId: data.jobID });
|
|
63
|
+
return;
|
|
58
64
|
case 'initiatingModel':
|
|
65
|
+
this.emit('job', { type: 'initiating', projectId: data.jobID, jobId: data.imgID });
|
|
66
|
+
return;
|
|
59
67
|
case 'jobStarted': {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (job) {
|
|
63
|
-
job._update({ status });
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
project._addJob({
|
|
67
|
-
id: data.imgID,
|
|
68
|
-
status,
|
|
69
|
-
step: 0,
|
|
70
|
-
stepCount: project.params.steps
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
break;
|
|
68
|
+
this.emit('job', { type: 'started', projectId: data.jobID, jobId: data.imgID });
|
|
69
|
+
return;
|
|
74
70
|
}
|
|
75
71
|
}
|
|
76
72
|
}
|
|
77
73
|
handleJobProgress(data) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
if (job) {
|
|
84
|
-
job._update({
|
|
85
|
-
status: 'creating',
|
|
86
|
-
step: data.step,
|
|
87
|
-
stepCount: data.stepCount
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
job = project._addJob({
|
|
92
|
-
id: data.imgID,
|
|
93
|
-
status: 'creating',
|
|
74
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
this.emit('job', {
|
|
76
|
+
type: 'progress',
|
|
77
|
+
projectId: data.jobID,
|
|
78
|
+
jobId: data.imgID,
|
|
94
79
|
step: data.step,
|
|
95
80
|
stepCount: data.stepCount
|
|
96
81
|
});
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
82
|
+
if (data.hasImage) {
|
|
83
|
+
this.downloadUrl({
|
|
84
|
+
jobId: data.jobID,
|
|
85
|
+
imageId: data.imgID,
|
|
86
|
+
type: 'preview'
|
|
87
|
+
}).then((url) => {
|
|
88
|
+
this.emit('job', {
|
|
89
|
+
type: 'preview',
|
|
90
|
+
projectId: data.jobID,
|
|
91
|
+
jobId: data.imgID,
|
|
92
|
+
url
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
});
|
|
107
97
|
}
|
|
108
98
|
handleJobResult(data) {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
if (job) {
|
|
115
|
-
job._update({
|
|
116
|
-
status: 'completed',
|
|
117
|
-
step: data.performedStepCount
|
|
99
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
100
|
+
const downloadUrl = yield this.downloadUrl({
|
|
101
|
+
jobId: data.jobID,
|
|
102
|
+
imageId: data.imgID,
|
|
103
|
+
type: 'complete'
|
|
118
104
|
});
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
stepCount: project.params.steps
|
|
105
|
+
this.emit('job', {
|
|
106
|
+
type: 'completed',
|
|
107
|
+
projectId: data.jobID,
|
|
108
|
+
jobId: data.imgID,
|
|
109
|
+
steps: data.performedStepCount,
|
|
110
|
+
resultUrl: downloadUrl
|
|
126
111
|
});
|
|
127
|
-
}
|
|
128
|
-
this.downloadUrl({
|
|
129
|
-
jobId: project.id,
|
|
130
|
-
imageId: job.id,
|
|
131
|
-
type: 'complete'
|
|
132
|
-
}).then((url) => {
|
|
133
|
-
job === null || job === void 0 ? void 0 : job._update({ resultUrl: url });
|
|
134
112
|
});
|
|
135
113
|
}
|
|
136
114
|
handleJobError(data) {
|
|
137
|
-
const project = this.projects.find((p) => p.id === data.jobID);
|
|
138
|
-
if (!project) {
|
|
139
|
-
return;
|
|
140
|
-
}
|
|
141
115
|
if (!data.imgID) {
|
|
142
|
-
|
|
143
|
-
|
|
116
|
+
this.emit('project', {
|
|
117
|
+
type: 'error',
|
|
118
|
+
projectId: data.jobID,
|
|
144
119
|
error: {
|
|
145
120
|
code: data.error,
|
|
146
121
|
message: data.error_message
|
|
@@ -148,31 +123,85 @@ class Projects extends ApiGroup_1.default {
|
|
|
148
123
|
});
|
|
149
124
|
return;
|
|
150
125
|
}
|
|
151
|
-
|
|
126
|
+
this.emit('job', {
|
|
127
|
+
type: 'error',
|
|
128
|
+
projectId: data.jobID,
|
|
129
|
+
jobId: data.imgID,
|
|
130
|
+
error: {
|
|
131
|
+
code: data.error,
|
|
132
|
+
message: data.error_message
|
|
133
|
+
}
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
handleProjectEvent(event) {
|
|
137
|
+
let project = this.projects.find((p) => p.id === event.projectId);
|
|
138
|
+
if (!project) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
switch (event.type) {
|
|
142
|
+
case 'queued':
|
|
143
|
+
project._update({
|
|
144
|
+
status: 'queued',
|
|
145
|
+
queuePosition: event.queuePosition
|
|
146
|
+
});
|
|
147
|
+
break;
|
|
148
|
+
case 'completed':
|
|
149
|
+
project._update({
|
|
150
|
+
status: 'completed'
|
|
151
|
+
});
|
|
152
|
+
break;
|
|
153
|
+
case 'error':
|
|
154
|
+
project._update({
|
|
155
|
+
status: 'failed',
|
|
156
|
+
error: event.error
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
handleJobEvent(event) {
|
|
161
|
+
let project = this.projects.find((p) => p.id === event.projectId);
|
|
162
|
+
if (!project) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
let job = project.job(event.jobId);
|
|
152
166
|
if (!job) {
|
|
153
|
-
project._addJob({
|
|
154
|
-
id:
|
|
155
|
-
status: '
|
|
167
|
+
job = project._addJob({
|
|
168
|
+
id: event.jobId,
|
|
169
|
+
status: 'pending',
|
|
156
170
|
step: 0,
|
|
157
|
-
stepCount: project.params.steps
|
|
158
|
-
error: {
|
|
159
|
-
code: data.error,
|
|
160
|
-
message: data.error_message
|
|
161
|
-
}
|
|
171
|
+
stepCount: project.params.steps
|
|
162
172
|
});
|
|
163
173
|
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
status: '
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
174
|
+
switch (event.type) {
|
|
175
|
+
case 'initiating':
|
|
176
|
+
job._update({ status: 'initiating' });
|
|
177
|
+
break;
|
|
178
|
+
case 'started':
|
|
179
|
+
job._update({ status: 'processing' });
|
|
180
|
+
break;
|
|
181
|
+
case 'progress':
|
|
182
|
+
job._update({
|
|
183
|
+
status: 'processing',
|
|
184
|
+
step: event.step,
|
|
185
|
+
stepCount: event.stepCount
|
|
186
|
+
});
|
|
187
|
+
if (project.status !== 'processing') {
|
|
188
|
+
project._update({ status: 'processing' });
|
|
170
189
|
}
|
|
171
|
-
|
|
190
|
+
break;
|
|
191
|
+
case 'preview':
|
|
192
|
+
job._update({ previewUrl: event.url });
|
|
193
|
+
break;
|
|
194
|
+
case 'completed':
|
|
195
|
+
job._update({ status: 'completed', step: event.steps, resultUrl: event.resultUrl });
|
|
196
|
+
break;
|
|
197
|
+
case 'error':
|
|
198
|
+
job._update({ status: 'failed', error: event.error });
|
|
199
|
+
break;
|
|
172
200
|
}
|
|
173
201
|
}
|
|
174
202
|
handleServerDisconnected() {
|
|
175
|
-
this.
|
|
203
|
+
this._availableModels = [];
|
|
204
|
+
this.emit('availableModels', this._availableModels);
|
|
176
205
|
}
|
|
177
206
|
/**
|
|
178
207
|
* Send new project request to the network. Returns project instance which can be used to track
|
|
@@ -220,5 +249,5 @@ class Projects extends ApiGroup_1.default {
|
|
|
220
249
|
});
|
|
221
250
|
}
|
|
222
251
|
}
|
|
223
|
-
exports.default =
|
|
252
|
+
exports.default = ProjectsApi;
|
|
224
253
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAmC;AASnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Projects/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { AvailableModel } from './index';
|
|
2
|
+
export interface ProjectEventBase {
|
|
3
|
+
projectId: string;
|
|
4
|
+
}
|
|
5
|
+
export interface ProjectQueued extends ProjectEventBase {
|
|
6
|
+
type: 'queued';
|
|
7
|
+
queuePosition: number;
|
|
8
|
+
}
|
|
9
|
+
export interface ProjectCompleted extends ProjectEventBase {
|
|
10
|
+
type: 'completed';
|
|
11
|
+
}
|
|
12
|
+
export interface ProjectError extends ProjectEventBase {
|
|
13
|
+
type: 'error';
|
|
14
|
+
error: {
|
|
15
|
+
code: number;
|
|
16
|
+
message: string;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
export type ProjectEvent = ProjectQueued | ProjectCompleted | ProjectError;
|
|
20
|
+
export interface JobEventBase {
|
|
21
|
+
projectId: string;
|
|
22
|
+
jobId: string;
|
|
23
|
+
}
|
|
24
|
+
export interface JobInitiating extends JobEventBase {
|
|
25
|
+
type: 'initiating';
|
|
26
|
+
}
|
|
27
|
+
export interface JobStarted extends JobEventBase {
|
|
28
|
+
type: 'started';
|
|
29
|
+
}
|
|
30
|
+
export interface JobProgress extends JobEventBase {
|
|
31
|
+
type: 'progress';
|
|
32
|
+
step: number;
|
|
33
|
+
stepCount: number;
|
|
34
|
+
}
|
|
35
|
+
export interface JobPreview extends JobEventBase {
|
|
36
|
+
type: 'preview';
|
|
37
|
+
url: string;
|
|
38
|
+
}
|
|
39
|
+
export interface JobCompleted extends JobEventBase {
|
|
40
|
+
type: 'completed';
|
|
41
|
+
steps: number;
|
|
42
|
+
resultUrl: string;
|
|
43
|
+
}
|
|
44
|
+
export interface JobError extends JobEventBase {
|
|
45
|
+
type: 'error';
|
|
46
|
+
error: {
|
|
47
|
+
code: number;
|
|
48
|
+
message: string;
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
export type JobEvent = JobInitiating | JobStarted | JobProgress | JobPreview | JobCompleted | JobError;
|
|
52
|
+
export interface ProjectApiEvents {
|
|
53
|
+
availableModels: AvailableModel[];
|
|
54
|
+
project: ProjectEvent;
|
|
55
|
+
job: JobEvent;
|
|
56
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/Projects/types/events.ts"],"names":[],"mappings":""}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
interface BaseConfig {
|
|
1
|
+
import AccountApi from './Account';
|
|
2
|
+
import ProjectsApi from './Projects';
|
|
3
|
+
export interface BaseConfig {
|
|
4
4
|
appId: string;
|
|
5
5
|
restEndpoint: string;
|
|
6
6
|
socketEndpoint: string;
|
|
7
7
|
}
|
|
8
|
-
interface SimpleConfig extends BaseConfig {
|
|
8
|
+
export interface SimpleConfig extends BaseConfig {
|
|
9
9
|
testnet: boolean;
|
|
10
10
|
}
|
|
11
|
-
interface FullConfig extends BaseConfig {
|
|
11
|
+
export interface FullConfig extends BaseConfig {
|
|
12
12
|
jsonRpcUrl: string;
|
|
13
13
|
}
|
|
14
|
-
type SogniClientConfig = SimpleConfig | FullConfig;
|
|
15
|
-
declare class SogniClient {
|
|
16
|
-
account:
|
|
17
|
-
projects:
|
|
14
|
+
export type SogniClientConfig = SimpleConfig | FullConfig;
|
|
15
|
+
export declare class SogniClient {
|
|
16
|
+
account: AccountApi;
|
|
17
|
+
projects: ProjectsApi;
|
|
18
18
|
private constructor();
|
|
19
19
|
get currentAccount(): import("./Account/CurrentAccount").default;
|
|
20
20
|
/**
|
package/dist/index.js
CHANGED
|
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.SogniClient = void 0;
|
|
15
16
|
const ethers_1 = require("ethers");
|
|
16
17
|
const Account_1 = __importDefault(require("./Account"));
|
|
17
18
|
const ApiClient_1 = __importDefault(require("./ApiClient/ApiClient"));
|
|
@@ -49,5 +50,6 @@ class SogniClient {
|
|
|
49
50
|
});
|
|
50
51
|
}
|
|
51
52
|
}
|
|
53
|
+
exports.SogniClient = SogniClient;
|
|
52
54
|
exports.default = SogniClient;
|
|
53
55
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAA+E;AAC/E,wDAAmC;AACnC,sEAA8C;AAE9C,sEAA8C;AAC9C,0DAAqC;AAkBrC,MAAa,WAAW;IAItB,YAAoB,MAAiB;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAO,cAAc,CAAC,MAAyB;;YACnD,MAAM,MAAM,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACvF,IAAI,QAA0B,CAAC;YAC/B,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;gBAC3B,QAAQ,GAAG,IAAI,wBAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC;gBAC9B,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;KAAA;CACF;AAjCD,kCAiCC;AAED,kBAAe,WAAW,CAAC"}
|
package/dist/lib/Entity.d.ts
CHANGED
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
import TypedEventEmitter from './TypedEventEmitter';
|
|
2
|
-
|
|
3
|
-
updated:
|
|
4
|
-
}
|
|
5
|
-
declare abstract class Entity<D> extends TypedEventEmitter<
|
|
2
|
+
export interface EntityEvents {
|
|
3
|
+
updated: string[];
|
|
4
|
+
}
|
|
5
|
+
declare abstract class Entity<D, E extends EntityEvents = EntityEvents> extends TypedEventEmitter<E> {
|
|
6
6
|
protected data: D;
|
|
7
7
|
constructor(data: D);
|
|
8
|
+
/**
|
|
9
|
+
* @internal
|
|
10
|
+
* @param delta
|
|
11
|
+
*/
|
|
8
12
|
_update(delta: Partial<D>): void;
|
|
13
|
+
/**
|
|
14
|
+
* Get a copy of the entity's data
|
|
15
|
+
*/
|
|
9
16
|
toJSON(): D;
|
|
10
17
|
}
|
|
11
18
|
export default Entity;
|
package/dist/lib/Entity.js
CHANGED
|
@@ -10,10 +10,19 @@ class Entity extends TypedEventEmitter_1.default {
|
|
|
10
10
|
super();
|
|
11
11
|
this.data = data;
|
|
12
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* @internal
|
|
15
|
+
* @param delta
|
|
16
|
+
*/
|
|
13
17
|
_update(delta) {
|
|
18
|
+
//@ts-ignore
|
|
19
|
+
const changedKeys = Object.keys(delta).filter((key) => this.data[key] !== delta[key]);
|
|
14
20
|
this.data = Object.assign(Object.assign({}, this.data), delta);
|
|
15
|
-
this.emit('updated',
|
|
21
|
+
this.emit('updated', changedKeys);
|
|
16
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Get a copy of the entity's data
|
|
25
|
+
*/
|
|
17
26
|
toJSON() {
|
|
18
27
|
return (0, lodash_1.cloneDeep)(this.data);
|
|
19
28
|
}
|
package/dist/lib/Entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/lib/Entity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AAMpD,MAAe,
|
|
1
|
+
{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/lib/Entity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AAMpD,MAAe,MAAiD,SAAQ,2BAAoB;IAG1F,YAAY,IAAO;QACjB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,KAAiB;QACvB,YAAY;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,mCAAQ,IAAI,CAAC,IAAI,GAAK,KAAK,CAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export
|
|
2
|
-
[
|
|
3
|
-
}
|
|
1
|
+
export interface EventMap {
|
|
2
|
+
[event: string]: any;
|
|
3
|
+
}
|
|
4
4
|
export type EventListener<D> = (data: D) => void;
|
|
5
5
|
declare abstract class TypedEventEmitter<E extends EventMap> {
|
|
6
6
|
protected listeners: {
|
|
@@ -12,6 +12,12 @@ declare abstract class TypedEventEmitter<E extends EventMap> {
|
|
|
12
12
|
* @param listener
|
|
13
13
|
*/
|
|
14
14
|
on<T extends keyof E>(event: T, listener: EventListener<E[T]>): () => void;
|
|
15
|
+
/**
|
|
16
|
+
* Add an event listener that will be called only once
|
|
17
|
+
* @param event
|
|
18
|
+
* @param listener
|
|
19
|
+
*/
|
|
20
|
+
once<T extends keyof E>(event: T, listener: EventListener<E[T]>): () => void;
|
|
15
21
|
/**
|
|
16
22
|
* Remove an event listener
|
|
17
23
|
* @param event
|
|
@@ -18,6 +18,18 @@ class TypedEventEmitter {
|
|
|
18
18
|
this.off(event, listener);
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Add an event listener that will be called only once
|
|
23
|
+
* @param event
|
|
24
|
+
* @param listener
|
|
25
|
+
*/
|
|
26
|
+
once(event, listener) {
|
|
27
|
+
const remove = this.on(event, (data) => {
|
|
28
|
+
remove();
|
|
29
|
+
listener(data);
|
|
30
|
+
});
|
|
31
|
+
return remove;
|
|
32
|
+
}
|
|
21
33
|
/**
|
|
22
34
|
* Remove an event listener
|
|
23
35
|
* @param event
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypedEventEmitter.js","sourceRoot":"","sources":["../../src/lib/TypedEventEmitter.ts"],"names":[],"mappings":";;AAMA,MAAe,iBAAiB;IAAhC;QACY,cAAS,GAA+C,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"TypedEventEmitter.js","sourceRoot":"","sources":["../../src/lib/TypedEventEmitter.ts"],"names":[],"mappings":";;AAMA,MAAe,iBAAiB;IAAhC;QACY,cAAS,GAA+C,EAAE,CAAC;IAsDvE,CAAC;IApDC;;;;OAIG;IACH,EAAE,CAAoB,KAAQ,EAAE,QAA6B;QAC3D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAoB,KAAQ,EAAE,QAA6B;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;YACrC,MAAM,EAAE,CAAC;YACT,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAoB,KAAQ,EAAE,QAA6B;QAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAoB,KAAQ,EAAE,IAAU;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAC"}
|