@blocklet/payment-broker-client 1.22.6 → 1.22.7
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/lib/browser/core/client.d.ts +4 -1
- package/lib/browser/core/client.d.ts.map +1 -1
- package/lib/browser/core/deployment.d.ts +2 -0
- package/lib/browser/core/deployment.d.ts.map +1 -1
- package/lib/browser/core/session.d.ts +4 -1
- package/lib/browser/core/session.d.ts.map +1 -1
- package/lib/browser/index.js +58 -57
- package/lib/browser/index.js.map +1 -1
- package/lib/core/client.d.ts +4 -1
- package/lib/core/client.d.ts.map +1 -1
- package/lib/core/client.js +2 -2
- package/lib/core/client.js.map +1 -1
- package/lib/core/deployment.d.ts +2 -0
- package/lib/core/deployment.d.ts.map +1 -1
- package/lib/core/deployment.js +53 -53
- package/lib/core/deployment.js.map +1 -1
- package/lib/core/session.d.ts +4 -1
- package/lib/core/session.d.ts.map +1 -1
- package/lib/core/session.js +3 -2
- package/lib/core/session.js.map +1 -1
- package/lib/index.d.ts +4 -1
- package/lib/index.esm.js +58 -57
- package/lib/index.esm.js.map +1 -1
- package/lib/index.js +58 -57
- package/lib/index.js.map +1 -1
- package/lib/node/core/client.d.ts +4 -1
- package/lib/node/core/client.d.ts.map +1 -1
- package/lib/node/core/deployment.d.ts +2 -0
- package/lib/node/core/deployment.d.ts.map +1 -1
- package/lib/node/core/session.d.ts +4 -1
- package/lib/node/core/session.d.ts.map +1 -1
- package/lib/node/index.js +58 -57
- package/lib/node/index.js.map +1 -1
- package/package.json +2 -2
package/lib/core/deployment.js
CHANGED
|
@@ -19,6 +19,8 @@ class DeploymentManager {
|
|
|
19
19
|
this.deps = deps;
|
|
20
20
|
this.sessionManager = sessionManager;
|
|
21
21
|
this.installationStarted = false;
|
|
22
|
+
this.appDid = '';
|
|
23
|
+
this.ownerDid = '';
|
|
22
24
|
this.currentDeployment = null;
|
|
23
25
|
}
|
|
24
26
|
async startDeployment(sessionId, options) {
|
|
@@ -31,8 +33,8 @@ class DeploymentManager {
|
|
|
31
33
|
try {
|
|
32
34
|
await this.waitForPaymentCompletion(sessionId, options);
|
|
33
35
|
const vendors = await this.waitForInstallation(sessionId, options);
|
|
34
|
-
await this.waitForServiceStartup(sessionId, vendors, options);
|
|
35
|
-
const result = await this.getFinalUrls(sessionId, vendors, options);
|
|
36
|
+
const appUrl = await this.waitForServiceStartup(sessionId, vendors, options);
|
|
37
|
+
const result = await this.getFinalUrls(sessionId, vendors, options, appUrl);
|
|
36
38
|
this.currentDeployment.result = result;
|
|
37
39
|
logger_1.default.info('Deployment completed successfully', { sessionId, duration: result.duration });
|
|
38
40
|
return result;
|
|
@@ -122,9 +124,9 @@ class DeploymentManager {
|
|
|
122
124
|
await options.hooks?.[types_1.STEPS.SERVICE_READY]?.({
|
|
123
125
|
vendors,
|
|
124
126
|
});
|
|
125
|
-
return;
|
|
127
|
+
return '';
|
|
126
128
|
}
|
|
127
|
-
await this.deps.pollingManager.poll({
|
|
129
|
+
const appUrl = await this.deps.pollingManager.poll({
|
|
128
130
|
checkCondition: async () => {
|
|
129
131
|
const { baseUrl } = await this.sessionManager.getConfigInfo();
|
|
130
132
|
// API_ENDPOINTS already includes /api prefix
|
|
@@ -144,25 +146,60 @@ class DeploymentManager {
|
|
|
144
146
|
await options.hooks?.[types_1.STEPS.SERVICE_READY]?.({
|
|
145
147
|
vendors,
|
|
146
148
|
});
|
|
149
|
+
return appUrl;
|
|
147
150
|
}
|
|
148
|
-
async getFinalUrls(sessionId, runningVendors, options) {
|
|
151
|
+
async getFinalUrls(sessionId, runningVendors, options, appUrl) {
|
|
149
152
|
try {
|
|
150
153
|
await options.hooks?.[types_1.STEPS.ACCESS_PREPARING]?.({
|
|
151
154
|
sessionId,
|
|
152
155
|
});
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
156
|
+
if (utils_1.isNode && !process.env.SKIP_DNS_CHECK) {
|
|
157
|
+
const result = await this.deps.pollingManager.poll({
|
|
158
|
+
checkCondition: async () => {
|
|
159
|
+
const url = utils_1.urlUtils.join(appUrl, '__blocklet__.js?type=json&noCache=1&owner=1');
|
|
160
|
+
let blockletInfo;
|
|
161
|
+
try {
|
|
162
|
+
blockletInfo = await this.deps.httpClient.get(url, true);
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
logger_1.default.error('Failed to get DNS status', { url, error: error.message });
|
|
166
|
+
}
|
|
167
|
+
if (blockletInfo?.componentMountPoints?.some((x) => ['failed', 'error'].includes(x.status))) {
|
|
168
|
+
return {
|
|
169
|
+
error: 'Startup error. Please recreate and retry.',
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
if (blockletInfo?.status === 'stopped') {
|
|
173
|
+
return {
|
|
174
|
+
error: 'Service has been stopped. Please check the service status and try again.',
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
if (!!blockletInfo?.ownerDid &&
|
|
178
|
+
blockletInfo?.componentMountPoints?.every((x) => ['running'].includes(x.status))) {
|
|
179
|
+
logger_1.default.debug('DNS has been ready', { url, status: blockletInfo.status, ownerDid: blockletInfo.ownerDid });
|
|
180
|
+
this.ownerDid = blockletInfo.ownerDid;
|
|
181
|
+
this.appDid = blockletInfo.appId;
|
|
182
|
+
return true;
|
|
183
|
+
}
|
|
184
|
+
logger_1.default.debug('DNS not ready', { url, status: blockletInfo.status, ownerDid: blockletInfo.ownerDid });
|
|
185
|
+
return false;
|
|
161
186
|
},
|
|
187
|
+
stepName: 'waiting_dns_ready',
|
|
162
188
|
});
|
|
189
|
+
if (result?.error) {
|
|
190
|
+
throw (0, errors_1.createDeploymentError)(result.error, 'DEPLOYMENT_ERROR', {
|
|
191
|
+
step: 'starting_service',
|
|
192
|
+
sessionId,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
163
195
|
}
|
|
164
|
-
|
|
165
|
-
|
|
196
|
+
else {
|
|
197
|
+
logger_1.default.info('Skipping DNS check');
|
|
198
|
+
}
|
|
199
|
+
const data = await this.sessionManager.getOrderDetails(sessionId, options.needShortUrl, {
|
|
200
|
+
ownerDid: this.ownerDid,
|
|
201
|
+
appDid: this.appDid,
|
|
202
|
+
});
|
|
166
203
|
// Return the URLs from the API response, fallback to running vendor data
|
|
167
204
|
const apiVendor = data.vendors[0];
|
|
168
205
|
const primaryVendor = runningVendors[0];
|
|
@@ -186,32 +223,6 @@ class DeploymentManager {
|
|
|
186
223
|
data: data.data,
|
|
187
224
|
};
|
|
188
225
|
logger_1.default.debug('Deployment result', result);
|
|
189
|
-
const startTime = Date.now();
|
|
190
|
-
if (utils_1.isNode && !process.env.SKIP_DNS_CHECK) {
|
|
191
|
-
await this.deps.pollingManager.poll({
|
|
192
|
-
checkCondition: async () => {
|
|
193
|
-
const url = utils_1.urlUtils.join(`${result.appUrl}/__blocklet__.js?type=json&noCache=1&owner=1`);
|
|
194
|
-
try {
|
|
195
|
-
const blockletInfo = await this.deps.httpClient.get(url, true);
|
|
196
|
-
if (blockletInfo?.status === 'running') {
|
|
197
|
-
return true;
|
|
198
|
-
}
|
|
199
|
-
logger_1.default.debug('DNS not ready', blockletInfo.status);
|
|
200
|
-
}
|
|
201
|
-
catch (error) {
|
|
202
|
-
logger_1.default.error('Failed to get DNS status', { url, error: error.message });
|
|
203
|
-
}
|
|
204
|
-
if (Date.now() - startTime > 30 * 1000) {
|
|
205
|
-
return true;
|
|
206
|
-
}
|
|
207
|
-
return false;
|
|
208
|
-
},
|
|
209
|
-
stepName: 'waiting_dns_ready',
|
|
210
|
-
});
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
logger_1.default.info('Skipping DNS check');
|
|
214
|
-
}
|
|
215
226
|
await options.hooks?.[types_1.STEPS.ACCESS_READY]?.({
|
|
216
227
|
sessionId,
|
|
217
228
|
appUrl: result.appUrl,
|
|
@@ -223,18 +234,7 @@ class DeploymentManager {
|
|
|
223
234
|
}
|
|
224
235
|
catch (error) {
|
|
225
236
|
logger_1.default.error('Failed to get final URLs', { sessionId, error: error.message });
|
|
226
|
-
|
|
227
|
-
return {
|
|
228
|
-
success: true,
|
|
229
|
-
sessionId,
|
|
230
|
-
appUrl: runningVendors[0]?.appUrl || null,
|
|
231
|
-
dashboardUrl: runningVendors[0]?.dashboardUrl || null,
|
|
232
|
-
homeUrl: runningVendors[0]?.homeUrl || null,
|
|
233
|
-
token: runningVendors[0]?.token || null,
|
|
234
|
-
duration: this.currentDeployment.startTime
|
|
235
|
-
? new Date().getTime() - new Date(this.currentDeployment.startTime).getTime()
|
|
236
|
-
: 0,
|
|
237
|
-
};
|
|
237
|
+
throw error;
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
240
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../src/core/deployment.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAEjD,qCAAiD;AAEjD,sDAA8B;AAE9B,mCAA8G;AAC9G,mCAAsD;AAEtD;;;GAGG;AACH,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../src/core/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/core/session.d.ts
CHANGED
|
@@ -31,6 +31,9 @@ export declare class SessionManager {
|
|
|
31
31
|
}): Promise<{}>;
|
|
32
32
|
getSessionStatus(sessionId: string): Promise<any>;
|
|
33
33
|
waitForPayment(sessionId: string): Promise<any>;
|
|
34
|
-
getOrderDetails(sessionId: string, shortUrl
|
|
34
|
+
getOrderDetails(sessionId: string, shortUrl: boolean, options: {
|
|
35
|
+
ownerDid: string;
|
|
36
|
+
appDid: string;
|
|
37
|
+
}): Promise<any>;
|
|
35
38
|
}
|
|
36
39
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAiB,MAAM,SAAS,CAAC;AAKzF,qBAAa,cAAc;IAIvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAJd,OAAO,CAAC,YAAY,CAAC,CAAiF;gBAG5F,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,mBAAmB;IAG7B,aAAa,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IA6C9G;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKlC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKnC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBzD,aAAa,CAAC,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAmDhF,iBAAiB,CACrB,OAAO,GAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAA2C;IA8C1F,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBvD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAiCzC,eAAe,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAiB,MAAM,SAAS,CAAC;AAKzF,qBAAa,cAAc;IAIvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,IAAI;IAJd,OAAO,CAAC,YAAY,CAAC,CAAiF;gBAG5F,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,mBAAmB;IAG7B,aAAa,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IA6C9G;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKlC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKnC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBzD,aAAa,CAAC,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAmDhF,iBAAiB,CACrB,OAAO,GAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAA2C;IA8C1F,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBvD,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAiCzC,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,GAAG,CAAC;CA6BhB"}
|
package/lib/core/session.js
CHANGED
|
@@ -215,12 +215,13 @@ class SessionManager {
|
|
|
215
215
|
interval: this.config.polling?.interval || 3000,
|
|
216
216
|
});
|
|
217
217
|
}
|
|
218
|
-
async getOrderDetails(sessionId, shortUrl
|
|
218
|
+
async getOrderDetails(sessionId, shortUrl, options) {
|
|
219
219
|
logger_1.default.debug('Getting order details', { sessionId });
|
|
220
220
|
const { baseUrl } = await this.getConfigInfo();
|
|
221
221
|
try {
|
|
222
|
+
const { ownerDid, appDid } = options;
|
|
222
223
|
// API_ENDPOINTS already includes /api prefix
|
|
223
|
-
const url = utils_1.urlUtils.join(baseUrl, types_1.API_ENDPOINTS.orderDetail.replace('{id}', sessionId), `?shortUrl=${shortUrl}`);
|
|
224
|
+
const url = utils_1.urlUtils.join(baseUrl, types_1.API_ENDPOINTS.orderDetail.replace('{id}', sessionId), `?shortUrl=${shortUrl ? 'true' : 'false'}&ownerDid=${ownerDid}&appDid=${appDid}`);
|
|
224
225
|
const response = await utils_1.timeUtils.timeout(this.deps.httpClient.get(url), this.config.timeout || 30000);
|
|
225
226
|
logger_1.default.debug('Order details retrieved', { sessionId });
|
|
226
227
|
return response;
|
package/lib/core/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -195,7 +195,10 @@ declare class BrokerClient {
|
|
|
195
195
|
sessionId: string;
|
|
196
196
|
}): Promise<{}>;
|
|
197
197
|
getSessionStatus(sessionId?: string): Promise<any>;
|
|
198
|
-
getSessionDetail(sessionId?: string, shortUrl?: boolean
|
|
198
|
+
getSessionDetail(sessionId?: string, shortUrl?: boolean, options?: {
|
|
199
|
+
ownerDid: string;
|
|
200
|
+
appDid: string;
|
|
201
|
+
}): Promise<any>;
|
|
199
202
|
cancelDeployment(): void;
|
|
200
203
|
getDeploymentStatus(): {
|
|
201
204
|
isDeploying: boolean;
|
package/lib/index.esm.js
CHANGED
|
@@ -500,12 +500,13 @@ class SessionManager {
|
|
|
500
500
|
interval: this.config.polling?.interval || 3000,
|
|
501
501
|
});
|
|
502
502
|
}
|
|
503
|
-
async getOrderDetails(sessionId, shortUrl
|
|
503
|
+
async getOrderDetails(sessionId, shortUrl, options) {
|
|
504
504
|
logger.debug('Getting order details', { sessionId });
|
|
505
505
|
const { baseUrl } = await this.getConfigInfo();
|
|
506
506
|
try {
|
|
507
|
+
const { ownerDid, appDid } = options;
|
|
507
508
|
// API_ENDPOINTS already includes /api prefix
|
|
508
|
-
const url = urlUtils.join(baseUrl, API_ENDPOINTS.orderDetail.replace('{id}', sessionId), `?shortUrl=${shortUrl}`);
|
|
509
|
+
const url = urlUtils.join(baseUrl, API_ENDPOINTS.orderDetail.replace('{id}', sessionId), `?shortUrl=${shortUrl ? 'true' : 'false'}&ownerDid=${ownerDid}&appDid=${appDid}`);
|
|
509
510
|
const response = await timeUtils.timeout(this.deps.httpClient.get(url), this.config.timeout || 30000);
|
|
510
511
|
logger.debug('Order details retrieved', { sessionId });
|
|
511
512
|
return response;
|
|
@@ -534,6 +535,8 @@ class DeploymentManager {
|
|
|
534
535
|
this.deps = deps;
|
|
535
536
|
this.sessionManager = sessionManager;
|
|
536
537
|
this.installationStarted = false;
|
|
538
|
+
this.appDid = '';
|
|
539
|
+
this.ownerDid = '';
|
|
537
540
|
this.currentDeployment = null;
|
|
538
541
|
}
|
|
539
542
|
async startDeployment(sessionId, options) {
|
|
@@ -546,8 +549,8 @@ class DeploymentManager {
|
|
|
546
549
|
try {
|
|
547
550
|
await this.waitForPaymentCompletion(sessionId, options);
|
|
548
551
|
const vendors = await this.waitForInstallation(sessionId, options);
|
|
549
|
-
await this.waitForServiceStartup(sessionId, vendors, options);
|
|
550
|
-
const result = await this.getFinalUrls(sessionId, vendors, options);
|
|
552
|
+
const appUrl = await this.waitForServiceStartup(sessionId, vendors, options);
|
|
553
|
+
const result = await this.getFinalUrls(sessionId, vendors, options, appUrl);
|
|
551
554
|
this.currentDeployment.result = result;
|
|
552
555
|
logger.info('Deployment completed successfully', { sessionId, duration: result.duration });
|
|
553
556
|
return result;
|
|
@@ -637,9 +640,9 @@ class DeploymentManager {
|
|
|
637
640
|
await options.hooks?.[STEPS.SERVICE_READY]?.({
|
|
638
641
|
vendors,
|
|
639
642
|
});
|
|
640
|
-
return;
|
|
643
|
+
return '';
|
|
641
644
|
}
|
|
642
|
-
await this.deps.pollingManager.poll({
|
|
645
|
+
const appUrl = await this.deps.pollingManager.poll({
|
|
643
646
|
checkCondition: async () => {
|
|
644
647
|
const { baseUrl } = await this.sessionManager.getConfigInfo();
|
|
645
648
|
// API_ENDPOINTS already includes /api prefix
|
|
@@ -659,25 +662,60 @@ class DeploymentManager {
|
|
|
659
662
|
await options.hooks?.[STEPS.SERVICE_READY]?.({
|
|
660
663
|
vendors,
|
|
661
664
|
});
|
|
665
|
+
return appUrl;
|
|
662
666
|
}
|
|
663
|
-
async getFinalUrls(sessionId, runningVendors, options) {
|
|
667
|
+
async getFinalUrls(sessionId, runningVendors, options, appUrl) {
|
|
664
668
|
try {
|
|
665
669
|
await options.hooks?.[STEPS.ACCESS_PREPARING]?.({
|
|
666
670
|
sessionId,
|
|
667
671
|
});
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
672
|
+
if (isNode && !process.env.SKIP_DNS_CHECK) {
|
|
673
|
+
const result = await this.deps.pollingManager.poll({
|
|
674
|
+
checkCondition: async () => {
|
|
675
|
+
const url = urlUtils.join(appUrl, '__blocklet__.js?type=json&noCache=1&owner=1');
|
|
676
|
+
let blockletInfo;
|
|
677
|
+
try {
|
|
678
|
+
blockletInfo = await this.deps.httpClient.get(url, true);
|
|
679
|
+
}
|
|
680
|
+
catch (error) {
|
|
681
|
+
logger.error('Failed to get DNS status', { url, error: error.message });
|
|
682
|
+
}
|
|
683
|
+
if (blockletInfo?.componentMountPoints?.some((x) => ['failed', 'error'].includes(x.status))) {
|
|
684
|
+
return {
|
|
685
|
+
error: 'Startup error. Please recreate and retry.',
|
|
686
|
+
};
|
|
687
|
+
}
|
|
688
|
+
if (blockletInfo?.status === 'stopped') {
|
|
689
|
+
return {
|
|
690
|
+
error: 'Service has been stopped. Please check the service status and try again.',
|
|
691
|
+
};
|
|
692
|
+
}
|
|
693
|
+
if (!!blockletInfo?.ownerDid &&
|
|
694
|
+
blockletInfo?.componentMountPoints?.every((x) => ['running'].includes(x.status))) {
|
|
695
|
+
logger.debug('DNS has been ready', { url, status: blockletInfo.status, ownerDid: blockletInfo.ownerDid });
|
|
696
|
+
this.ownerDid = blockletInfo.ownerDid;
|
|
697
|
+
this.appDid = blockletInfo.appId;
|
|
698
|
+
return true;
|
|
699
|
+
}
|
|
700
|
+
logger.debug('DNS not ready', { url, status: blockletInfo.status, ownerDid: blockletInfo.ownerDid });
|
|
701
|
+
return false;
|
|
676
702
|
},
|
|
703
|
+
stepName: 'waiting_dns_ready',
|
|
677
704
|
});
|
|
705
|
+
if (result?.error) {
|
|
706
|
+
throw createDeploymentError(result.error, 'DEPLOYMENT_ERROR', {
|
|
707
|
+
step: 'starting_service',
|
|
708
|
+
sessionId,
|
|
709
|
+
});
|
|
710
|
+
}
|
|
711
|
+
}
|
|
712
|
+
else {
|
|
713
|
+
logger.info('Skipping DNS check');
|
|
678
714
|
}
|
|
679
|
-
|
|
680
|
-
|
|
715
|
+
const data = await this.sessionManager.getOrderDetails(sessionId, options.needShortUrl, {
|
|
716
|
+
ownerDid: this.ownerDid,
|
|
717
|
+
appDid: this.appDid,
|
|
718
|
+
});
|
|
681
719
|
// Return the URLs from the API response, fallback to running vendor data
|
|
682
720
|
const apiVendor = data.vendors[0];
|
|
683
721
|
const primaryVendor = runningVendors[0];
|
|
@@ -701,32 +739,6 @@ class DeploymentManager {
|
|
|
701
739
|
data: data.data,
|
|
702
740
|
};
|
|
703
741
|
logger.debug('Deployment result', result);
|
|
704
|
-
const startTime = Date.now();
|
|
705
|
-
if (isNode && !process.env.SKIP_DNS_CHECK) {
|
|
706
|
-
await this.deps.pollingManager.poll({
|
|
707
|
-
checkCondition: async () => {
|
|
708
|
-
const url = urlUtils.join(`${result.appUrl}/__blocklet__.js?type=json&noCache=1&owner=1`);
|
|
709
|
-
try {
|
|
710
|
-
const blockletInfo = await this.deps.httpClient.get(url, true);
|
|
711
|
-
if (blockletInfo?.status === 'running') {
|
|
712
|
-
return true;
|
|
713
|
-
}
|
|
714
|
-
logger.debug('DNS not ready', blockletInfo.status);
|
|
715
|
-
}
|
|
716
|
-
catch (error) {
|
|
717
|
-
logger.error('Failed to get DNS status', { url, error: error.message });
|
|
718
|
-
}
|
|
719
|
-
if (Date.now() - startTime > 30 * 1000) {
|
|
720
|
-
return true;
|
|
721
|
-
}
|
|
722
|
-
return false;
|
|
723
|
-
},
|
|
724
|
-
stepName: 'waiting_dns_ready',
|
|
725
|
-
});
|
|
726
|
-
}
|
|
727
|
-
else {
|
|
728
|
-
logger.info('Skipping DNS check');
|
|
729
|
-
}
|
|
730
742
|
await options.hooks?.[STEPS.ACCESS_READY]?.({
|
|
731
743
|
sessionId,
|
|
732
744
|
appUrl: result.appUrl,
|
|
@@ -738,18 +750,7 @@ class DeploymentManager {
|
|
|
738
750
|
}
|
|
739
751
|
catch (error) {
|
|
740
752
|
logger.error('Failed to get final URLs', { sessionId, error: error.message });
|
|
741
|
-
|
|
742
|
-
return {
|
|
743
|
-
success: true,
|
|
744
|
-
sessionId,
|
|
745
|
-
appUrl: runningVendors[0]?.appUrl || null,
|
|
746
|
-
dashboardUrl: runningVendors[0]?.dashboardUrl || null,
|
|
747
|
-
homeUrl: runningVendors[0]?.homeUrl || null,
|
|
748
|
-
token: runningVendors[0]?.token || null,
|
|
749
|
-
duration: this.currentDeployment.startTime
|
|
750
|
-
? new Date().getTime() - new Date(this.currentDeployment.startTime).getTime()
|
|
751
|
-
: 0,
|
|
752
|
-
};
|
|
753
|
+
throw error;
|
|
753
754
|
}
|
|
754
755
|
}
|
|
755
756
|
}
|
|
@@ -856,8 +857,8 @@ class BrokerClient {
|
|
|
856
857
|
getSessionStatus(sessionId) {
|
|
857
858
|
return this.sessionManager.getSessionStatus(sessionId || this.currentDeployment.sessionId);
|
|
858
859
|
}
|
|
859
|
-
getSessionDetail(sessionId, shortUrl) {
|
|
860
|
-
return this.sessionManager.getOrderDetails(sessionId || this.currentDeployment.sessionId, shortUrl ?? this.config.needShortUrl ?? true);
|
|
860
|
+
getSessionDetail(sessionId, shortUrl, options = { ownerDid: '', appDid: '' }) {
|
|
861
|
+
return this.sessionManager.getOrderDetails(sessionId || this.currentDeployment.sessionId, shortUrl ?? this.config.needShortUrl ?? true, options);
|
|
861
862
|
}
|
|
862
863
|
cancelDeployment() {
|
|
863
864
|
if (this.isDeploying) {
|