Skip to content

Commit

Permalink
Merge pull request #88 from ainize-team/release/1.0.5
Browse files Browse the repository at this point in the history
Upgrade version to 1.0.5
  • Loading branch information
yoojinko authored Dec 26, 2023
2 parents ac066ee + 3413516 commit ae1312f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ainize-team/ainize-js",
"version": "1.0.4",
"version": "1.0.5",
"main": "dist/ainize.js",
"types": "dist/ainize.d.ts",
"scripts": {
Expand Down
26 changes: 15 additions & 11 deletions src/controllers/serviceController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,24 @@ export default class ServiceController {
return await this.ain.getValue(creditHistoryPath) as creditHistories;
}

async request(serviceName: string, requestData: any) : Promise<any> {
async request(serviceName: string, requestData: any, requestKey?: string) : Promise<any> {
this.checkRunning(serviceName);
const result = await new Promise(async (resolve, reject) => {
const requestKey = Date.now();
const requesterAddress = this.ain.getAddress();
const responsePath = Path.app(serviceName).response(requesterAddress, requestKey.toString());
await this.handler.subscribe(responsePath, resolve);
const requestPath = Path.app(serviceName).request(requesterAddress, requestKey);
const requestOp = buildSetOperation("SET_VALUE", requestPath, requestData);
const txBody = buildTxBody(requestOp);
await this.ain.sendTransaction(txBody);
return requestKey;
requestKey = requestKey || Date.now().toString();
try {
const requesterAddress = this.ain.getAddress();
const responsePath = Path.app(serviceName).response(requesterAddress, requestKey.toString());
await this.handler.subscribe(responsePath, resolve);
const requestPath = Path.app(serviceName).request(requesterAddress, requestKey);
const requestOp = buildSetOperation("SET_VALUE", requestPath, requestData);
const txBody = buildTxBody(requestOp);
await this.ain.sendTransaction(txBody);
} catch (e: any) {
if (e instanceof Error)
return reject(new Error(e.message));
}
});
return result as string;
return result;
}

async run(serviceName: string): Promise<void> {
Expand Down
4 changes: 2 additions & 2 deletions src/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ export default class Service {
* @param {string} requestData String data for request to service.
* @returns {string} Response data from service.
*/
async request(requestData: any) {
async request(requestData: any, requestKey?: string) {
this.isLoggedIn();
return await this.serviceController.request(this.serviceName, requestData);
return await this.serviceController.request(this.serviceName, requestData, requestKey);
}

/**
Expand Down

0 comments on commit ae1312f

Please sign in to comment.