@vtecx/vtecxnext 1.0.6 → 1.0.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.
@@ -722,3 +722,9 @@ export declare class VtecxNextError extends Error {
722
722
  status: number;
723
723
  constructor(status: number, message: string);
724
724
  }
725
+ /**
726
+ * Fetch Error
727
+ */
728
+ export declare class FetchError extends VtecxNextError {
729
+ constructor(message: string);
730
+ }
package/dist/vtecxnext.js CHANGED
@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.deleteSignature = exports.putSignatures = exports.putSignature = exports.toPdf = exports.getBQCsv = exports.getBQ = exports.deleteBQ = exports.postBQ = exports.getPage = exports.pagination = exports.getSessionLong = exports.getSessionString = exports.getSessionEntry = exports.getSessionFeed = exports.deleteSessionLong = exports.deleteSessionString = exports.deleteSessionEntry = exports.deleteSessionFeed = exports.incrementSession = exports.setSessionLong = exports.setSessionString = exports.setSessionEntry = exports.setSessionFeed = exports.getRangeids = exports.rangeids = exports.setids = exports.getids = exports.addids = exports.allocids = exports.deleteFolder = exports.deleteEntry = exports.put = exports.post = exports.count = exports.getFeed = exports.getEntry = exports.log = exports.rxid = exports.service = exports.isLoggedin = exports.whoami = exports.account = exports.uid = exports.now = exports.logout = exports.loginWithRxid = exports.login = exports.sendMessage = exports.checkXRequestedWith = exports.hello = void 0;
30
- exports.VtecxNextError = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = void 0;
30
+ exports.FetchError = exports.VtecxNextError = exports.buffer = exports.oauthCallbackLine = exports.oauthLine = exports.removealias = exports.addalias = exports.removeacl = exports.addacl = exports.getcontent = exports.deletecontent = exports.putcontent = exports.savefiles = exports.deleteusers = exports.deleteuser = exports.canceluser = exports.activateusers = exports.activateuser = exports.revokeusers = exports.revokeuser = exports.userstatus = exports.changeaccount_verify = exports.changeaccount = exports.changepassByAdmin = exports.changepass = exports.passreset = exports.adduserByAdmin = exports.adduser = exports.noGroupMember = exports.leaveGroup = exports.joinGroup = exports.getMessageQueue = exports.setMessageQueue = exports.setMessageQueueStatus = exports.pushNotification = exports.sendMail = exports.checkSignature = void 0;
31
31
  const sqlstring_1 = __importDefault(require("sqlstring"));
32
32
  const formidable_1 = __importDefault(require("formidable"));
33
33
  const fs_1 = __importDefault(require("fs"));
@@ -89,7 +89,13 @@ const login = async (req, res, wsse, reCaptchaToken) => {
89
89
  const method = 'GET';
90
90
  const url = `/d/?_login${param}`;
91
91
  const headers = { 'X-WSSE': `${wsse}` };
92
- const response = await fetchVtecx(method, url, headers);
92
+ let response;
93
+ try {
94
+ response = await fetchVtecx(method, url, headers);
95
+ }
96
+ catch (e) {
97
+ throw newFetchError(e, true);
98
+ }
93
99
  //const feed = await response.json()
94
100
  // vte.cxからのset-cookieを転記
95
101
  setCookie(response, res);
@@ -121,7 +127,13 @@ const loginWithRxid = async (req, res, rxid) => {
121
127
  // reCAPTCHA tokenは任意
122
128
  const method = 'GET';
123
129
  const url = `/d/?_login&_RXID=${rxid}`;
124
- const response = await requestVtecx(method, url, req);
130
+ let response;
131
+ try {
132
+ response = await requestVtecx(method, url, req);
133
+ }
134
+ catch (e) {
135
+ throw newFetchError(e, true);
136
+ }
125
137
  const feed = await response.json();
126
138
  // vte.cxからのset-cookieを転記
127
139
  setCookie(response, res);
@@ -149,7 +161,13 @@ const logout = async (req, res) => {
149
161
  // vte.cxへリクエスト
150
162
  const method = 'GET';
151
163
  const url = '/d/?_logout';
152
- const response = await requestVtecx(method, url, req);
164
+ let response;
165
+ try {
166
+ response = await requestVtecx(method, url, req);
167
+ }
168
+ catch (e) {
169
+ throw newFetchError(e, true);
170
+ }
153
171
  //console.log(`[vtecxnext logout] response=${response}`)
154
172
  // vte.cxからのset-cookieを転記
155
173
  setCookie(response, res);
@@ -171,7 +189,13 @@ const now = async () => {
171
189
  // vte.cxへリクエスト
172
190
  const method = 'GET';
173
191
  const url = '/d/?_now';
174
- const response = await requestVtecx(method, url);
192
+ let response;
193
+ try {
194
+ response = await requestVtecx(method, url);
195
+ }
196
+ catch (e) {
197
+ throw newFetchError(e, true);
198
+ }
175
199
  //console.log(`[vtecxnext now] response=${response}`)
176
200
  // レスポンスのエラーチェック
177
201
  await checkVtecxResponse(response);
@@ -191,7 +215,13 @@ const uid = async (req, res) => {
191
215
  // vte.cxへリクエスト
192
216
  const method = 'GET';
193
217
  const url = '/d/?_uid';
194
- const response = await requestVtecx(method, url, req);
218
+ let response;
219
+ try {
220
+ response = await requestVtecx(method, url, req);
221
+ }
222
+ catch (e) {
223
+ throw newFetchError(e, true);
224
+ }
195
225
  //console.log(`[vtecxnext uid] response=${response}`)
196
226
  // vte.cxからのset-cookieを転記
197
227
  setCookie(response, res);
@@ -213,7 +243,13 @@ const account = async (req, res) => {
213
243
  // vte.cxへリクエスト
214
244
  const method = 'GET';
215
245
  const url = '/d/?_account';
216
- const response = await requestVtecx(method, url, req);
246
+ let response;
247
+ try {
248
+ response = await requestVtecx(method, url, req);
249
+ }
250
+ catch (e) {
251
+ throw newFetchError(e, true);
252
+ }
217
253
  //console.log(`[vtecxnext account] response=${response}`)
218
254
  // vte.cxからのset-cookieを転記
219
255
  setCookie(response, res);
@@ -235,7 +271,13 @@ const whoami = async (req, res) => {
235
271
  // vte.cxへリクエスト
236
272
  const method = 'GET';
237
273
  const url = '/d/?_whoami';
238
- const response = await requestVtecx(method, url, req);
274
+ let response;
275
+ try {
276
+ response = await requestVtecx(method, url, req);
277
+ }
278
+ catch (e) {
279
+ throw newFetchError(e, true);
280
+ }
239
281
  //console.log(`[vtecxnext whoami] response=${response}`)
240
282
  // vte.cxからのset-cookieを転記
241
283
  setCookie(response, res);
@@ -273,7 +315,13 @@ const service = async (req, res) => {
273
315
  // vte.cxへリクエスト
274
316
  const method = 'GET';
275
317
  const url = '/d/?_service';
276
- const response = await requestVtecx(method, url, req);
318
+ let response;
319
+ try {
320
+ response = await requestVtecx(method, url, req);
321
+ }
322
+ catch (e) {
323
+ throw newFetchError(e, true);
324
+ }
277
325
  //console.log(`[vtecxnext service] response=${response}`)
278
326
  // vte.cxからのset-cookieを転記
279
327
  setCookie(response, res);
@@ -295,7 +343,13 @@ const rxid = async (req, res) => {
295
343
  // vte.cxへリクエスト
296
344
  const method = 'GET';
297
345
  const url = '/d/?_getrxid';
298
- const response = await requestVtecx(method, url, req);
346
+ let response;
347
+ try {
348
+ response = await requestVtecx(method, url, req);
349
+ }
350
+ catch (e) {
351
+ throw newFetchError(e, true);
352
+ }
299
353
  //console.log(`[vtecxnext uid] response=${response}`)
300
354
  // vte.cxからのset-cookieを転記
301
355
  setCookie(response, res);
@@ -316,12 +370,18 @@ exports.rxid = rxid;
316
370
  * @return true if successful
317
371
  */
318
372
  const log = async (req, res, message, title, subtitle) => {
319
- const logTitle = title ? title : 'JavaScript';
320
- const logSubtitle = subtitle ? subtitle : 'INFO';
373
+ const logTitle = title ?? 'JavaScript';
374
+ const logSubtitle = subtitle ?? 'INFO';
321
375
  const feed = [{ 'title': logTitle, 'subtitle': logSubtitle, 'summary': message }];
322
376
  const method = 'POST';
323
377
  const url = `/p/?_log`;
324
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
378
+ let response;
379
+ try {
380
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
381
+ }
382
+ catch (e) {
383
+ throw newFetchError(e, true);
384
+ }
325
385
  //console.log(`[vtecxnext log] response. status=${response.status}`)
326
386
  // vte.cxからのset-cookieを転記
327
387
  setCookie(response, res);
@@ -346,7 +406,13 @@ const getEntry = async (req, res, uri, targetService) => {
346
406
  // vte.cxへリクエスト
347
407
  const method = 'GET';
348
408
  const url = `/p${uri}?e`;
349
- const response = await requestVtecx(method, url, req, null, null, targetService);
409
+ let response;
410
+ try {
411
+ response = await requestVtecx(method, url, req, null, null, targetService);
412
+ }
413
+ catch (e) {
414
+ throw newFetchError(e, true);
415
+ }
350
416
  //console.log(`[vtecxnext getEntry] response=${response}`)
351
417
  // vte.cxからのset-cookieを転記
352
418
  setCookie(response, res);
@@ -370,7 +436,13 @@ const getFeed = async (req, res, uri, targetService) => {
370
436
  // vte.cxへリクエスト
371
437
  const method = 'GET';
372
438
  const url = `/p${uri}${uri.includes('?') ? '&' : '?'}f`;
373
- const response = await requestVtecx(method, url, req, null, null, targetService);
439
+ let response;
440
+ try {
441
+ response = await requestVtecx(method, url, req, null, null, targetService);
442
+ }
443
+ catch (e) {
444
+ throw newFetchError(e, true);
445
+ }
374
446
  //console.log(`[vtecxnext getFeed] response=${response}`)
375
447
  // vte.cxからのset-cookieを転記
376
448
  setCookie(response, res);
@@ -394,7 +466,13 @@ const count = async (req, res, uri, targetService) => {
394
466
  // vte.cxへリクエスト
395
467
  const method = 'GET';
396
468
  const url = `/p${uri}${uri.includes('?') ? '&' : '?'}c`;
397
- const response = await requestVtecx(method, url, req, null, null, targetService);
469
+ let response;
470
+ try {
471
+ response = await requestVtecx(method, url, req, null, null, targetService);
472
+ }
473
+ catch (e) {
474
+ throw newFetchError(e, true);
475
+ }
398
476
  //console.log(`[vtecxnext count] response=${response}`)
399
477
  // vte.cxからのset-cookieを転記
400
478
  setCookie(response, res);
@@ -424,7 +502,13 @@ const post = async (req, res, feed, uri, targetService) => {
424
502
  // vte.cxへリクエスト
425
503
  const method = 'POST';
426
504
  const url = `/p${uri ? uri : '/'}?e`;
427
- const response = await requestVtecx(method, url, req, JSON.stringify(feed), null, targetService);
505
+ let response;
506
+ try {
507
+ response = await requestVtecx(method, url, req, JSON.stringify(feed), null, targetService);
508
+ }
509
+ catch (e) {
510
+ throw newFetchError(e, true);
511
+ }
428
512
  //console.log(`[vtecxnext post] response. status=${response.status}`)
429
513
  // vte.cxからのset-cookieを転記
430
514
  setCookie(response, res);
@@ -455,7 +539,13 @@ const put = async (req, res, feed, isbulk, parallel, async, targetService) => {
455
539
  }
456
540
  const url = `/p/?e${additionalParam}`;
457
541
  //console.log(`[vtecxnext put] url=${url}`)
458
- const response = await requestVtecx(method, url, req, JSON.stringify(feed), null, targetService);
542
+ let response;
543
+ try {
544
+ response = await requestVtecx(method, url, req, JSON.stringify(feed), null, targetService);
545
+ }
546
+ catch (e) {
547
+ throw newFetchError(e, true);
548
+ }
459
549
  //console.log(`[vtecxnext put] response. status=${response.status}`)
460
550
  // vte.cxからのset-cookieを転記
461
551
  setCookie(response, res);
@@ -480,7 +570,13 @@ const deleteEntry = async (req, res, uri, revision, targetService) => {
480
570
  const method = 'DELETE';
481
571
  const param = revision ? `&r=${revision}` : '';
482
572
  const url = `/p${uri}?e${param}`;
483
- const response = await requestVtecx(method, url, req, null, null, targetService);
573
+ let response;
574
+ try {
575
+ response = await requestVtecx(method, url, req, null, null, targetService);
576
+ }
577
+ catch (e) {
578
+ throw newFetchError(e, true);
579
+ }
484
580
  //console.log(`[vtecxnext deleteEntry] response. status=${response.status}`)
485
581
  // vte.cxからのset-cookieを転記
486
582
  setCookie(response, res);
@@ -504,7 +600,13 @@ const deleteFolder = async (req, res, uri, async, targetService) => {
504
600
  // vte.cxへリクエスト
505
601
  const method = 'DELETE';
506
602
  const url = `/p${uri}?_rf${async ? '&_async' : ''}`;
507
- const response = await requestVtecx(method, url, req, null, null, targetService);
603
+ let response;
604
+ try {
605
+ response = await requestVtecx(method, url, req, null, null, targetService);
606
+ }
607
+ catch (e) {
608
+ throw newFetchError(e, true);
609
+ }
508
610
  //console.log(`[vtecxnext deleteFolder] response. status=${response.status}`)
509
611
  // vte.cxからのset-cookieを転記
510
612
  setCookie(response, res);
@@ -529,7 +631,13 @@ const allocids = async (req, res, uri, num, targetService) => {
529
631
  // vte.cxへリクエスト
530
632
  const method = 'GET';
531
633
  const url = `/p${uri}?_allocids=${num}`;
532
- const response = await requestVtecx(method, url, req, null, null, targetService);
634
+ let response;
635
+ try {
636
+ response = await requestVtecx(method, url, req, null, null, targetService);
637
+ }
638
+ catch (e) {
639
+ throw newFetchError(e, true);
640
+ }
533
641
  //console.log(`[vtecxnext allocids] response=${response}`)
534
642
  // vte.cxからのset-cookieを転記
535
643
  setCookie(response, res);
@@ -556,7 +664,13 @@ const addids = async (req, res, uri, num, targetService) => {
556
664
  // vte.cxへリクエスト
557
665
  const method = 'PUT';
558
666
  const url = `/p${uri}?_addids=${num}`;
559
- const response = await requestVtecx(method, url, req, null, null, targetService);
667
+ let response;
668
+ try {
669
+ response = await requestVtecx(method, url, req, null, null, targetService);
670
+ }
671
+ catch (e) {
672
+ throw newFetchError(e, true);
673
+ }
560
674
  //console.log(`[vtecxnext addids] response=${response}`)
561
675
  // vte.cxからのset-cookieを転記
562
676
  setCookie(response, res);
@@ -581,7 +695,13 @@ const getids = async (req, res, uri, targetService) => {
581
695
  // vte.cxへリクエスト
582
696
  const method = 'GET';
583
697
  const url = `/p${uri}?_getids`;
584
- const response = await requestVtecx(method, url, req, null, null, targetService);
698
+ let response;
699
+ try {
700
+ response = await requestVtecx(method, url, req, null, null, targetService);
701
+ }
702
+ catch (e) {
703
+ throw newFetchError(e, true);
704
+ }
585
705
  //console.log(`[vtecxnext getids] response=${response}`)
586
706
  // vte.cxからのset-cookieを転記
587
707
  setCookie(response, res);
@@ -608,7 +728,13 @@ const setids = async (req, res, uri, num, targetService) => {
608
728
  // vte.cxへリクエスト
609
729
  const method = 'PUT';
610
730
  const url = `/p${uri}?_setids=${num}`;
611
- const response = await requestVtecx(method, url, req, null, null, targetService);
731
+ let response;
732
+ try {
733
+ response = await requestVtecx(method, url, req, null, null, targetService);
734
+ }
735
+ catch (e) {
736
+ throw newFetchError(e, true);
737
+ }
612
738
  //console.log(`[vtecxnext setids] response=${response}`)
613
739
  // vte.cxからのset-cookieを転記
614
740
  setCookie(response, res);
@@ -636,7 +762,13 @@ const rangeids = async (req, res, uri, range) => {
636
762
  const method = 'PUT';
637
763
  const url = `/p${uri}?_rangeids`;
638
764
  const feed = { feed: { 'title': range } };
639
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
765
+ let response;
766
+ try {
767
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
768
+ }
769
+ catch (e) {
770
+ throw newFetchError(e, true);
771
+ }
640
772
  //console.log(`[vtecxnext rangeids] response=${response}`)
641
773
  // vte.cxからのset-cookieを転記
642
774
  setCookie(response, res);
@@ -661,7 +793,13 @@ const getRangeids = async (req, res, uri) => {
661
793
  // vte.cxへリクエスト
662
794
  const method = 'GET';
663
795
  const url = `/p${uri}?_rangeids`;
664
- const response = await requestVtecx(method, url, req);
796
+ let response;
797
+ try {
798
+ response = await requestVtecx(method, url, req);
799
+ }
800
+ catch (e) {
801
+ throw newFetchError(e, true);
802
+ }
665
803
  //console.log(`[vtecxnext getrangeids] response=${response}`)
666
804
  // vte.cxからのset-cookieを転記
667
805
  setCookie(response, res);
@@ -688,7 +826,13 @@ const setSessionFeed = async (req, res, name, feed) => {
688
826
  // vte.cxへリクエスト
689
827
  const method = 'PUT';
690
828
  const url = `/p/?_sessionfeed=${name}`;
691
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
829
+ let response;
830
+ try {
831
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
832
+ }
833
+ catch (e) {
834
+ throw newFetchError(e, true);
835
+ }
692
836
  //console.log(`[vtecxnext setSessionFeed] response. status=${response.status}`)
693
837
  // vte.cxからのset-cookieを転記
694
838
  setCookie(response, res);
@@ -714,7 +858,13 @@ const setSessionEntry = async (req, res, name, entry) => {
714
858
  const method = 'PUT';
715
859
  const url = `/p/?_sessionentry=${name}`;
716
860
  const feed = { feed: { 'entry': entry } };
717
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
861
+ let response;
862
+ try {
863
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
864
+ }
865
+ catch (e) {
866
+ throw newFetchError(e, true);
867
+ }
718
868
  //console.log(`[vtecxnext setSessionEntry] response. status=${response.status}`)
719
869
  // vte.cxからのset-cookieを転記
720
870
  setCookie(response, res);
@@ -740,7 +890,13 @@ const setSessionString = async (req, res, name, str) => {
740
890
  const method = 'PUT';
741
891
  const url = `/p/?_sessionstring=${name}`;
742
892
  const feed = { feed: { 'title': str } };
743
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
893
+ let response;
894
+ try {
895
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
896
+ }
897
+ catch (e) {
898
+ throw newFetchError(e, true);
899
+ }
744
900
  //console.log(`[vtecxnext setSessionString] response. status=${response.status}`)
745
901
  // vte.cxからのset-cookieを転記
746
902
  setCookie(response, res);
@@ -766,7 +922,13 @@ const setSessionLong = async (req, res, name, num) => {
766
922
  const method = 'PUT';
767
923
  const url = `/p/?_sessionlong=${name}`;
768
924
  const feed = { feed: { 'title': String(num) } };
769
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
925
+ let response;
926
+ try {
927
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
928
+ }
929
+ catch (e) {
930
+ throw newFetchError(e, true);
931
+ }
770
932
  //console.log(`[vtecxnext setSessionLong] response. status=${response.status}`)
771
933
  // vte.cxからのset-cookieを転記
772
934
  setCookie(response, res);
@@ -791,7 +953,13 @@ const incrementSession = async (req, res, name, num) => {
791
953
  // vte.cxへリクエスト
792
954
  const method = 'PUT';
793
955
  const url = `/p/?_sessionincr=${name}&_num=${num}`;
794
- const response = await requestVtecx(method, url, req);
956
+ let response;
957
+ try {
958
+ response = await requestVtecx(method, url, req);
959
+ }
960
+ catch (e) {
961
+ throw newFetchError(e, true);
962
+ }
795
963
  //console.log(`[vtecxnext incrementSession] response. status=${response.status}`)
796
964
  // vte.cxからのset-cookieを転記
797
965
  setCookie(response, res);
@@ -816,7 +984,13 @@ const deleteSessionFeed = async (req, res, name) => {
816
984
  // vte.cxへリクエスト
817
985
  const method = 'DELETE';
818
986
  const url = `/p/?_sessionfeed=${name}`;
819
- const response = await requestVtecx(method, url, req);
987
+ let response;
988
+ try {
989
+ response = await requestVtecx(method, url, req);
990
+ }
991
+ catch (e) {
992
+ throw newFetchError(e, true);
993
+ }
820
994
  //console.log(`[vtecxnext deleteSessionFeed] response. status=${response.status}`)
821
995
  // vte.cxからのset-cookieを転記
822
996
  setCookie(response, res);
@@ -839,7 +1013,13 @@ const deleteSessionEntry = async (req, res, name) => {
839
1013
  // vte.cxへリクエスト
840
1014
  const method = 'DELETE';
841
1015
  const url = `/p/?_sessionentry=${name}`;
842
- const response = await requestVtecx(method, url, req);
1016
+ let response;
1017
+ try {
1018
+ response = await requestVtecx(method, url, req);
1019
+ }
1020
+ catch (e) {
1021
+ throw newFetchError(e, true);
1022
+ }
843
1023
  //console.log(`[vtecxnext deleteSessionEntry] response. status=${response.status}`)
844
1024
  // vte.cxからのset-cookieを転記
845
1025
  setCookie(response, res);
@@ -862,7 +1042,13 @@ const deleteSessionString = async (req, res, name) => {
862
1042
  // vte.cxへリクエスト
863
1043
  const method = 'DELETE';
864
1044
  const url = `/p/?_sessionstring=${name}`;
865
- const response = await requestVtecx(method, url, req);
1045
+ let response;
1046
+ try {
1047
+ response = await requestVtecx(method, url, req);
1048
+ }
1049
+ catch (e) {
1050
+ throw newFetchError(e, true);
1051
+ }
866
1052
  //console.log(`[vtecxnext deleteSessionString] response. status=${response.status}`)
867
1053
  // vte.cxからのset-cookieを転記
868
1054
  setCookie(response, res);
@@ -885,7 +1071,13 @@ const deleteSessionLong = async (req, res, name) => {
885
1071
  // vte.cxへリクエスト
886
1072
  const method = 'DELETE';
887
1073
  const url = `/p/?_sessionlong=${name}`;
888
- const response = await requestVtecx(method, url, req);
1074
+ let response;
1075
+ try {
1076
+ response = await requestVtecx(method, url, req);
1077
+ }
1078
+ catch (e) {
1079
+ throw newFetchError(e, true);
1080
+ }
889
1081
  //console.log(`[vtecxnext deleteSessionLong] response. status=${response.status}`)
890
1082
  // vte.cxからのset-cookieを転記
891
1083
  setCookie(response, res);
@@ -908,7 +1100,13 @@ const getSessionFeed = async (req, res, name) => {
908
1100
  // vte.cxへリクエスト
909
1101
  const method = 'GET';
910
1102
  const url = `/p/?_sessionfeed=${name}`;
911
- const response = await requestVtecx(method, url, req);
1103
+ let response;
1104
+ try {
1105
+ response = await requestVtecx(method, url, req);
1106
+ }
1107
+ catch (e) {
1108
+ throw newFetchError(e, true);
1109
+ }
912
1110
  //console.log(`[vtecxnext getSessionFeed] response. status=${response.status}`)
913
1111
  // vte.cxからのset-cookieを転記
914
1112
  setCookie(response, res);
@@ -932,7 +1130,13 @@ const getSessionEntry = async (req, res, name) => {
932
1130
  // vte.cxへリクエスト
933
1131
  const method = 'GET';
934
1132
  const url = `/p/?_sessionentry=${name}`;
935
- const response = await requestVtecx(method, url, req);
1133
+ let response;
1134
+ try {
1135
+ response = await requestVtecx(method, url, req);
1136
+ }
1137
+ catch (e) {
1138
+ throw newFetchError(e, true);
1139
+ }
936
1140
  //console.log(`[vtecxnext getSessionEntry] response. status=${response.status}`)
937
1141
  // vte.cxからのset-cookieを転記
938
1142
  setCookie(response, res);
@@ -956,7 +1160,13 @@ const getSessionString = async (req, res, name) => {
956
1160
  // vte.cxへリクエスト
957
1161
  const method = 'GET';
958
1162
  const url = `/p/?_sessionstring=${name}`;
959
- const response = await requestVtecx(method, url, req);
1163
+ let response;
1164
+ try {
1165
+ response = await requestVtecx(method, url, req);
1166
+ }
1167
+ catch (e) {
1168
+ throw newFetchError(e, true);
1169
+ }
960
1170
  //console.log(`[vtecxnext getSessionString] response. status=${response.status}`)
961
1171
  // vte.cxからのset-cookieを転記
962
1172
  setCookie(response, res);
@@ -986,7 +1196,13 @@ const getSessionLong = async (req, res, name) => {
986
1196
  // vte.cxへリクエスト
987
1197
  const method = 'GET';
988
1198
  const url = `/p/?_sessionlong=${name}`;
989
- const response = await requestVtecx(method, url, req);
1199
+ let response;
1200
+ try {
1201
+ response = await requestVtecx(method, url, req);
1202
+ }
1203
+ catch (e) {
1204
+ throw newFetchError(e, true);
1205
+ }
990
1206
  //console.log(`[vtecxnext getSessionLong] response. status=${response.status}`)
991
1207
  // vte.cxからのset-cookieを転記
992
1208
  setCookie(response, res);
@@ -1017,7 +1233,13 @@ const pagination = async (req, res, uri, pagerange, targetService) => {
1017
1233
  // vte.cxへリクエスト
1018
1234
  const method = 'GET';
1019
1235
  const url = `/p${uri}${uri.includes('?') ? '&' : '?'}_pagination=${pagerange}`;
1020
- const response = await requestVtecx(method, url, req, null, null, targetService);
1236
+ let response;
1237
+ try {
1238
+ response = await requestVtecx(method, url, req, null, null, targetService);
1239
+ }
1240
+ catch (e) {
1241
+ throw newFetchError(e, true);
1242
+ }
1021
1243
  //console.log(`[vtecxnext pagination] response=${response}`)
1022
1244
  // vte.cxからのset-cookieを転記
1023
1245
  setCookie(response, res);
@@ -1043,7 +1265,13 @@ const getPage = async (req, res, uri, num, targetService) => {
1043
1265
  // vte.cxへリクエスト
1044
1266
  const method = 'GET';
1045
1267
  const url = `/p${uri}${uri.includes('?') ? '&' : '?'}n=${num}`;
1046
- const response = await requestVtecx(method, url, req, null, null, targetService);
1268
+ let response;
1269
+ try {
1270
+ response = await requestVtecx(method, url, req, null, null, targetService);
1271
+ }
1272
+ catch (e) {
1273
+ throw newFetchError(e, true);
1274
+ }
1047
1275
  //console.log(`[vtecxnext getPage] response=${response}`)
1048
1276
  // vte.cxからのset-cookieを転記
1049
1277
  setCookie(response, res);
@@ -1076,7 +1304,13 @@ const postBQ = async (req, res, feed, async, tablenames) => {
1076
1304
  // vte.cxへリクエスト
1077
1305
  const method = 'POST';
1078
1306
  const url = `/p/?_bq${async ? '&_async' : ''}`;
1079
- const response = await requestVtecx(method, url, req, JSON.stringify(reqFeed));
1307
+ let response;
1308
+ try {
1309
+ response = await requestVtecx(method, url, req, JSON.stringify(reqFeed));
1310
+ }
1311
+ catch (e) {
1312
+ throw newFetchError(e, true);
1313
+ }
1080
1314
  //console.log(`[vtecxnext postBQ] response. status=${response.status}`)
1081
1315
  // vte.cxからのset-cookieを転記
1082
1316
  setCookie(response, res);
@@ -1117,7 +1351,13 @@ const deleteBQ = async (req, res, keys, async, tablenames) => {
1117
1351
  // vte.cxへリクエスト
1118
1352
  const method = 'DELETE';
1119
1353
  const url = `/p/?_bq${async ? '&_async' : ''}`;
1120
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1354
+ let response;
1355
+ try {
1356
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1357
+ }
1358
+ catch (e) {
1359
+ throw newFetchError(e, true);
1360
+ }
1121
1361
  //console.log(`[vtecxnext deleteBQ] response. status=${response.status}`)
1122
1362
  // vte.cxからのset-cookieを転記
1123
1363
  setCookie(response, res);
@@ -1144,7 +1384,13 @@ const getBQ = async (req, res, sql, values, parent) => {
1144
1384
  // vte.cxへリクエスト
1145
1385
  const method = 'PUT';
1146
1386
  const url = `/p/?_querybq`;
1147
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1387
+ let response;
1388
+ try {
1389
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1390
+ }
1391
+ catch (e) {
1392
+ throw newFetchError(e, true);
1393
+ }
1148
1394
  //console.log(`[vtecxnext getBQ] response. status=${response.status}`)
1149
1395
  // vte.cxからのset-cookieを転記
1150
1396
  setCookie(response, res);
@@ -1175,7 +1421,13 @@ const getBQCsv = async (req, res, sql, values, filename, parent) => {
1175
1421
  // vte.cxへリクエスト
1176
1422
  const method = 'PUT';
1177
1423
  const url = `/p/?_querybq&_csv${filename ? '=' + filename : ''}`;
1178
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1424
+ let response;
1425
+ try {
1426
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1427
+ }
1428
+ catch (e) {
1429
+ throw newFetchError(e, true);
1430
+ }
1179
1431
  //console.log(`[vtecxnext getBQCsv] response. status=${response.status}`)
1180
1432
  // vte.cxからのset-cookieを転記
1181
1433
  setCookie(response, res);
@@ -1207,7 +1459,13 @@ const toPdf = async (req, res, htmlTemplate, filename) => {
1207
1459
  // vte.cxへリクエスト
1208
1460
  const method = 'PUT';
1209
1461
  const url = `/p/?_pdf${filename ? '=' + filename : ''}`;
1210
- const response = await requestVtecx(method, url, req, htmlTemplate);
1462
+ let response;
1463
+ try {
1464
+ response = await requestVtecx(method, url, req, htmlTemplate);
1465
+ }
1466
+ catch (e) {
1467
+ throw newFetchError(e, true);
1468
+ }
1211
1469
  //console.log(`[vtecxnext toPdf] response. status=${response.status}`)
1212
1470
  // vte.cxからのset-cookieを転記
1213
1471
  setCookie(response, res);
@@ -1238,7 +1496,13 @@ const putSignature = async (req, res, uri, revision) => {
1238
1496
  // vte.cxへリクエスト
1239
1497
  const method = 'PUT';
1240
1498
  const url = `/p${uri}?_signature${revision ? '&r=' + revision : ''}`;
1241
- const response = await requestVtecx(method, url, req);
1499
+ let response;
1500
+ try {
1501
+ response = await requestVtecx(method, url, req);
1502
+ }
1503
+ catch (e) {
1504
+ throw newFetchError(e, true);
1505
+ }
1242
1506
  //console.log(`[vtecxnext putSignature] response=${response}`)
1243
1507
  // vte.cxからのset-cookieを転記
1244
1508
  setCookie(response, res);
@@ -1262,7 +1526,13 @@ const putSignatures = async (req, res, feed) => {
1262
1526
  // vte.cxへリクエスト
1263
1527
  const method = 'PUT';
1264
1528
  const url = `/p/?_signature`;
1265
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1529
+ let response;
1530
+ try {
1531
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1532
+ }
1533
+ catch (e) {
1534
+ throw newFetchError(e, true);
1535
+ }
1266
1536
  //console.log(`[vtecxnext putSignatures] response=${response}`)
1267
1537
  // vte.cxからのset-cookieを転記
1268
1538
  setCookie(response, res);
@@ -1287,7 +1557,13 @@ const deleteSignature = async (req, res, uri, revision) => {
1287
1557
  // vte.cxへリクエスト
1288
1558
  const method = 'DELETE';
1289
1559
  const url = `/p${uri}?_signature${revision ? '&r=' + revision : ''}`;
1290
- const response = await requestVtecx(method, url, req);
1560
+ let response;
1561
+ try {
1562
+ response = await requestVtecx(method, url, req);
1563
+ }
1564
+ catch (e) {
1565
+ throw newFetchError(e, true);
1566
+ }
1291
1567
  //console.log(`[vtecxnext deleteSignature] response=${response}`)
1292
1568
  // vte.cxからのset-cookieを転記
1293
1569
  setCookie(response, res);
@@ -1310,7 +1586,13 @@ const checkSignature = async (req, res, uri) => {
1310
1586
  // vte.cxへリクエスト
1311
1587
  const method = 'GET';
1312
1588
  const url = `/p${uri}?_signature`;
1313
- const response = await requestVtecx(method, url, req);
1589
+ let response;
1590
+ try {
1591
+ response = await requestVtecx(method, url, req);
1592
+ }
1593
+ catch (e) {
1594
+ throw newFetchError(e, true);
1595
+ }
1314
1596
  //console.log(`[vtecxnext checkSignature] response=${response}`)
1315
1597
  // vte.cxからのset-cookieを転記
1316
1598
  setCookie(response, res);
@@ -1365,7 +1647,13 @@ const sendMail = async (req, res, entry, to, cc, bcc, attachments) => {
1365
1647
  // vte.cxへリクエスト
1366
1648
  const method = 'POST';
1367
1649
  const url = `/p/?_sendmail`;
1368
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1650
+ let response;
1651
+ try {
1652
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1653
+ }
1654
+ catch (e) {
1655
+ throw newFetchError(e, true);
1656
+ }
1369
1657
  //console.log(`[vtecxnext sendMail] response. status=${response.status}`)
1370
1658
  // vte.cxからのset-cookieを転記
1371
1659
  setCookie(response, res);
@@ -1429,7 +1717,13 @@ const pushNotification = async (req, res, message, to, title, subtitle, imageUrl
1429
1717
  // vte.cxへリクエスト
1430
1718
  const method = 'POST';
1431
1719
  const url = `/p/?_pushnotification`;
1432
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1720
+ let response;
1721
+ try {
1722
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1723
+ }
1724
+ catch (e) {
1725
+ throw newFetchError(e, true);
1726
+ }
1433
1727
  //console.log(`[vtecxnext pushNotification] response. status=${response.status}`)
1434
1728
  // vte.cxからのset-cookieを転記
1435
1729
  setCookie(response, res);
@@ -1452,7 +1746,13 @@ const setMessageQueueStatus = async (req, res, flag, channel) => {
1452
1746
  // vte.cxへリクエスト
1453
1747
  const method = 'PUT';
1454
1748
  const url = `/p${channel}?_mqstatus=${flag ? 'true' : 'false'}`;
1455
- const response = await requestVtecx(method, url, req);
1749
+ let response;
1750
+ try {
1751
+ response = await requestVtecx(method, url, req);
1752
+ }
1753
+ catch (e) {
1754
+ throw newFetchError(e, true);
1755
+ }
1456
1756
  //console.log(`[vtecxnext setMessageQueueStatus] response=${response}`)
1457
1757
  // vte.cxからのset-cookieを転記
1458
1758
  setCookie(response, res);
@@ -1477,7 +1777,13 @@ const setMessageQueue = async (req, res, feed, channel) => {
1477
1777
  // vte.cxへリクエスト
1478
1778
  const method = 'POST';
1479
1779
  const url = `/p${channel}?_mq`;
1480
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1780
+ let response;
1781
+ try {
1782
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1783
+ }
1784
+ catch (e) {
1785
+ throw newFetchError(e, true);
1786
+ }
1481
1787
  //console.log(`[vtecxnext setMessageQueue] response. status=${response.status}`)
1482
1788
  // vte.cxからのset-cookieを転記
1483
1789
  setCookie(response, res);
@@ -1500,7 +1806,13 @@ const getMessageQueue = async (req, res, channel) => {
1500
1806
  // vte.cxへリクエスト
1501
1807
  const method = 'GET';
1502
1808
  const url = `/p${channel}?_mq`;
1503
- const response = await requestVtecx(method, url, req);
1809
+ let response;
1810
+ try {
1811
+ response = await requestVtecx(method, url, req);
1812
+ }
1813
+ catch (e) {
1814
+ throw newFetchError(e, true);
1815
+ }
1504
1816
  //console.log(`[vtecxnext getMessageQueue] response. status=${response.status}`)
1505
1817
  // vte.cxからのset-cookieを転記
1506
1818
  setCookie(response, res);
@@ -1526,7 +1838,13 @@ const joinGroup = async (req, res, group, selfid) => {
1526
1838
  // vte.cxへリクエスト
1527
1839
  const method = 'PUT';
1528
1840
  const url = `/p${group}?_joingroup&_selfid=${selfid}`;
1529
- const response = await requestVtecx(method, url, req);
1841
+ let response;
1842
+ try {
1843
+ response = await requestVtecx(method, url, req);
1844
+ }
1845
+ catch (e) {
1846
+ throw newFetchError(e, true);
1847
+ }
1530
1848
  //console.log(`[vtecxnext joinGroup] response. status=${response.status}`)
1531
1849
  // vte.cxからのset-cookieを転記
1532
1850
  setCookie(response, res);
@@ -1550,7 +1868,13 @@ const leaveGroup = async (req, res, group) => {
1550
1868
  // vte.cxへリクエスト
1551
1869
  const method = 'DELETE';
1552
1870
  const url = `/p${group}?_leavegroup`;
1553
- const response = await requestVtecx(method, url, req);
1871
+ let response;
1872
+ try {
1873
+ response = await requestVtecx(method, url, req);
1874
+ }
1875
+ catch (e) {
1876
+ throw newFetchError(e, true);
1877
+ }
1554
1878
  //console.log(`[vtecxnext leaveGroup] response. status=${response.status}`)
1555
1879
  // vte.cxからのset-cookieを転記
1556
1880
  setCookie(response, res);
@@ -1575,7 +1899,13 @@ const noGroupMember = async (req, res, uri) => {
1575
1899
  // vte.cxへリクエスト
1576
1900
  const method = 'GET';
1577
1901
  const url = `/d${uri}?_no_group_member`;
1578
- const response = await requestVtecx(method, url, req);
1902
+ let response;
1903
+ try {
1904
+ response = await requestVtecx(method, url, req);
1905
+ }
1906
+ catch (e) {
1907
+ throw newFetchError(e, true);
1908
+ }
1579
1909
  //console.log(`[vtecxnext noGroupMember] response=${response}`)
1580
1910
  // vte.cxからのset-cookieを転記
1581
1911
  setCookie(response, res);
@@ -1601,7 +1931,13 @@ const adduser = async (req, res, feed, reCaptchaToken) => {
1601
1931
  const method = 'POST';
1602
1932
  const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
1603
1933
  const url = `/d/?_adduser${param}`;
1604
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1934
+ let response;
1935
+ try {
1936
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1937
+ }
1938
+ catch (e) {
1939
+ throw newFetchError(e, true);
1940
+ }
1605
1941
  //console.log(`[vtecxnext adduser] response. status=${response.status}`)
1606
1942
  // vte.cxからのset-cookieを転記
1607
1943
  setCookie(response, res);
@@ -1625,7 +1961,13 @@ const adduserByAdmin = async (req, res, feed) => {
1625
1961
  // vte.cxへリクエスト
1626
1962
  const method = 'POST';
1627
1963
  const url = `/d/?_adduserByAdmin`;
1628
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1964
+ let response;
1965
+ try {
1966
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1967
+ }
1968
+ catch (e) {
1969
+ throw newFetchError(e, true);
1970
+ }
1629
1971
  //console.log(`[vtecxnext adduserByAdmin] response. status=${response.status}`)
1630
1972
  // vte.cxからのset-cookieを転記
1631
1973
  setCookie(response, res);
@@ -1650,7 +1992,13 @@ const passreset = async (req, res, feed, reCaptchaToken) => {
1650
1992
  const method = 'POST';
1651
1993
  const param = reCaptchaToken ? `&g-recaptcha-token=${reCaptchaToken}` : '';
1652
1994
  const url = `/d/?_passreset${param}`;
1653
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
1995
+ let response;
1996
+ try {
1997
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
1998
+ }
1999
+ catch (e) {
2000
+ throw newFetchError(e, true);
2001
+ }
1654
2002
  //console.log(`[vtecxnext passreset] response. status=${response.status}`)
1655
2003
  // vte.cxからのset-cookieを転記
1656
2004
  setCookie(response, res);
@@ -1673,7 +2021,13 @@ const changepass = async (req, res, feed) => {
1673
2021
  // vte.cxへリクエスト
1674
2022
  const method = 'PUT';
1675
2023
  const url = `/d/?_changephash`;
1676
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2024
+ let response;
2025
+ try {
2026
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2027
+ }
2028
+ catch (e) {
2029
+ throw newFetchError(e, true);
2030
+ }
1677
2031
  //console.log(`[vtecxnext changepass] response. status=${response.status}`)
1678
2032
  // vte.cxからのset-cookieを転記
1679
2033
  setCookie(response, res);
@@ -1696,7 +2050,13 @@ const changepassByAdmin = async (req, res, feed) => {
1696
2050
  // vte.cxへリクエスト
1697
2051
  const method = 'PUT';
1698
2052
  const url = `/d/?_changephashByAdmin`;
1699
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2053
+ let response;
2054
+ try {
2055
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2056
+ }
2057
+ catch (e) {
2058
+ throw newFetchError(e, true);
2059
+ }
1700
2060
  //console.log(`[vtecxnext changepassByAdmin] response. status=${response.status}`)
1701
2061
  // vte.cxからのset-cookieを転記
1702
2062
  setCookie(response, res);
@@ -1719,7 +2079,13 @@ const changeaccount = async (req, res, feed) => {
1719
2079
  // vte.cxへリクエスト
1720
2080
  const method = 'PUT';
1721
2081
  const url = `/d/?_changeaccount`;
1722
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2082
+ let response;
2083
+ try {
2084
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2085
+ }
2086
+ catch (e) {
2087
+ throw newFetchError(e, true);
2088
+ }
1723
2089
  //console.log(`[vtecxnext changeaccount] response. status=${response.status}`)
1724
2090
  // vte.cxからのset-cookieを転記
1725
2091
  setCookie(response, res);
@@ -1742,7 +2108,13 @@ const changeaccount_verify = async (req, res, verifyCode) => {
1742
2108
  // vte.cxへリクエスト
1743
2109
  const method = 'PUT';
1744
2110
  const url = `/d/?_changeaccount_verify=${verifyCode}`;
1745
- const response = await requestVtecx(method, url, req);
2111
+ let response;
2112
+ try {
2113
+ response = await requestVtecx(method, url, req);
2114
+ }
2115
+ catch (e) {
2116
+ throw newFetchError(e, true);
2117
+ }
1746
2118
  //console.log(`[vtecxnext changeaccount_verify] response=${response}`)
1747
2119
  // vte.cxからのset-cookieを転記
1748
2120
  setCookie(response, res);
@@ -1764,7 +2136,13 @@ const userstatus = async (req, res, account) => {
1764
2136
  // vte.cxへリクエスト
1765
2137
  const method = 'GET';
1766
2138
  const url = `/d/?_userstatus${account ? '=' + account : ''}`;
1767
- const response = await requestVtecx(method, url, req);
2139
+ let response;
2140
+ try {
2141
+ response = await requestVtecx(method, url, req);
2142
+ }
2143
+ catch (e) {
2144
+ throw newFetchError(e, true);
2145
+ }
1768
2146
  //console.log(`[vtecxnext userstatus] response=${response}`)
1769
2147
  // vte.cxからのset-cookieを転記
1770
2148
  setCookie(response, res);
@@ -1788,7 +2166,13 @@ const revokeuser = async (req, res, account) => {
1788
2166
  // vte.cxへリクエスト
1789
2167
  const method = 'PUT';
1790
2168
  const url = `/d/?_revokeuser=${account}`;
1791
- const response = await requestVtecx(method, url, req);
2169
+ let response;
2170
+ try {
2171
+ response = await requestVtecx(method, url, req);
2172
+ }
2173
+ catch (e) {
2174
+ throw newFetchError(e, true);
2175
+ }
1792
2176
  //console.log(`[vtecxnext revokeuser] response=${response}`)
1793
2177
  // vte.cxからのset-cookieを転記
1794
2178
  setCookie(response, res);
@@ -1812,7 +2196,13 @@ const revokeusers = async (req, res, feed) => {
1812
2196
  // vte.cxへリクエスト
1813
2197
  const method = 'PUT';
1814
2198
  const url = `/d/?_revokeuser`;
1815
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2199
+ let response;
2200
+ try {
2201
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2202
+ }
2203
+ catch (e) {
2204
+ throw newFetchError(e, true);
2205
+ }
1816
2206
  //console.log(`[vtecxnext revokeusers] response. status=${response.status}`)
1817
2207
  // vte.cxからのset-cookieを転記
1818
2208
  setCookie(response, res);
@@ -1835,7 +2225,13 @@ const activateuser = async (req, res, account) => {
1835
2225
  // vte.cxへリクエスト
1836
2226
  const method = 'PUT';
1837
2227
  const url = `/d/?_activateuser=${account}`;
1838
- const response = await requestVtecx(method, url, req);
2228
+ let response;
2229
+ try {
2230
+ response = await requestVtecx(method, url, req);
2231
+ }
2232
+ catch (e) {
2233
+ throw newFetchError(e, true);
2234
+ }
1839
2235
  //console.log(`[vtecxnext activateuser] response=${response}`)
1840
2236
  // vte.cxからのset-cookieを転記
1841
2237
  setCookie(response, res);
@@ -1859,7 +2255,13 @@ const activateusers = async (req, res, feed) => {
1859
2255
  // vte.cxへリクエスト
1860
2256
  const method = 'PUT';
1861
2257
  const url = `/d/?_activateuser`;
1862
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2258
+ let response;
2259
+ try {
2260
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2261
+ }
2262
+ catch (e) {
2263
+ throw newFetchError(e, true);
2264
+ }
1863
2265
  //console.log(`[vtecxnext activateusers] response. status=${response.status}`)
1864
2266
  // vte.cxからのset-cookieを転記
1865
2267
  setCookie(response, res);
@@ -1880,7 +2282,13 @@ const canceluser = async (req, res) => {
1880
2282
  // vte.cxへリクエスト
1881
2283
  const method = 'DELETE';
1882
2284
  const url = `/d/?_canceluser`;
1883
- const response = await requestVtecx(method, url, req);
2285
+ let response;
2286
+ try {
2287
+ response = await requestVtecx(method, url, req);
2288
+ }
2289
+ catch (e) {
2290
+ throw newFetchError(e, true);
2291
+ }
1884
2292
  //console.log(`[vtecxnext canceluser] response=${response}`)
1885
2293
  // vte.cxからのset-cookieを転記
1886
2294
  setCookie(response, res);
@@ -1904,7 +2312,13 @@ const deleteuser = async (req, res, account) => {
1904
2312
  // vte.cxへリクエスト
1905
2313
  const method = 'DELETE';
1906
2314
  const url = `/d/?_deleteuser=${account}`;
1907
- const response = await requestVtecx(method, url, req);
2315
+ let response;
2316
+ try {
2317
+ response = await requestVtecx(method, url, req);
2318
+ }
2319
+ catch (e) {
2320
+ throw newFetchError(e, true);
2321
+ }
1908
2322
  //console.log(`[vtecxnext deleteuser] response=${response}`)
1909
2323
  // vte.cxからのset-cookieを転記
1910
2324
  setCookie(response, res);
@@ -1928,7 +2342,13 @@ const deleteusers = async (req, res, feed) => {
1928
2342
  // vte.cxへリクエスト
1929
2343
  const method = 'DELETE';
1930
2344
  const url = `/d/?_deleteuser`;
1931
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2345
+ let response;
2346
+ try {
2347
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2348
+ }
2349
+ catch (e) {
2350
+ throw newFetchError(e, true);
2351
+ }
1932
2352
  //console.log(`[vtecxnext deleteusers] response. status=${response.status}`)
1933
2353
  // vte.cxからのset-cookieを転記
1934
2354
  setCookie(response, res);
@@ -2044,7 +2464,13 @@ const putcontent = async (req, res, uri) => {
2044
2464
  //const headers = {'Content-Type' : req.headers['content-type'], 'Content-Length' : req.headers['content-length']}
2045
2465
  const headers = { 'Content-Type': req.headers['content-type'] };
2046
2466
  const buf = await (0, exports.buffer)(req);
2047
- const response = await requestVtecx(method, url, req, buf, headers);
2467
+ let response;
2468
+ try {
2469
+ response = await requestVtecx(method, url, req, buf, headers);
2470
+ }
2471
+ catch (e) {
2472
+ throw newFetchError(e, true);
2473
+ }
2048
2474
  //console.log(`[vtecxnext putcontent] response. status=${response.status}`)
2049
2475
  // vte.cxからのset-cookieを転記
2050
2476
  setCookie(response, res);
@@ -2067,7 +2493,13 @@ const deletecontent = async (req, res, uri) => {
2067
2493
  // vte.cxへリクエスト
2068
2494
  const method = 'DELETE';
2069
2495
  const url = `/p${uri}?_content`;
2070
- const response = await requestVtecx(method, url, req);
2496
+ let response;
2497
+ try {
2498
+ response = await requestVtecx(method, url, req);
2499
+ }
2500
+ catch (e) {
2501
+ throw newFetchError(e, true);
2502
+ }
2071
2503
  //console.log(`[vtecxnext deletecontent] response. status=${response.status}`)
2072
2504
  // vte.cxからのset-cookieを転記
2073
2505
  setCookie(response, res);
@@ -2091,7 +2523,13 @@ const getcontent = async (req, res, uri) => {
2091
2523
  // vte.cxへリクエスト
2092
2524
  const method = 'GET';
2093
2525
  const url = `/p${uri}?_content`;
2094
- const response = await requestVtecx(method, url, req);
2526
+ let response;
2527
+ try {
2528
+ response = await requestVtecx(method, url, req);
2529
+ }
2530
+ catch (e) {
2531
+ throw newFetchError(e, true);
2532
+ }
2095
2533
  //console.log(`[vtecxnext getcontent] response. status=${response.status}`)
2096
2534
  // vte.cxからのset-cookieを転記
2097
2535
  setCookie(response, res);
@@ -2127,7 +2565,13 @@ const addacl = async (req, res, feed) => {
2127
2565
  // vte.cxへリクエスト
2128
2566
  const method = 'PUT';
2129
2567
  const url = `/d/?_addacl`;
2130
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2568
+ let response;
2569
+ try {
2570
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2571
+ }
2572
+ catch (e) {
2573
+ throw newFetchError(e, true);
2574
+ }
2131
2575
  //console.log(`[vtecxnext addacl] response=${response}`)
2132
2576
  // vte.cxからのset-cookieを転記
2133
2577
  setCookie(response, res);
@@ -2151,7 +2595,13 @@ const removeacl = async (req, res, feed) => {
2151
2595
  // vte.cxへリクエスト
2152
2596
  const method = 'PUT';
2153
2597
  const url = `/d/?_removeacl`;
2154
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2598
+ let response;
2599
+ try {
2600
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2601
+ }
2602
+ catch (e) {
2603
+ throw newFetchError(e, true);
2604
+ }
2155
2605
  //console.log(`[vtecxnext removeacl] response=${response}`)
2156
2606
  // vte.cxからのset-cookieを転記
2157
2607
  setCookie(response, res);
@@ -2175,7 +2625,13 @@ const addalias = async (req, res, feed) => {
2175
2625
  // vte.cxへリクエスト
2176
2626
  const method = 'PUT';
2177
2627
  const url = `/d/?_addalias`;
2178
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2628
+ let response;
2629
+ try {
2630
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2631
+ }
2632
+ catch (e) {
2633
+ throw newFetchError(e, true);
2634
+ }
2179
2635
  //console.log(`[vtecxnext addalias] response=${response}`)
2180
2636
  // vte.cxからのset-cookieを転記
2181
2637
  setCookie(response, res);
@@ -2199,7 +2655,13 @@ const removealias = async (req, res, feed) => {
2199
2655
  // vte.cxへリクエスト
2200
2656
  const method = 'PUT';
2201
2657
  const url = `/d/?_removealias`;
2202
- const response = await requestVtecx(method, url, req, JSON.stringify(feed));
2658
+ let response;
2659
+ try {
2660
+ response = await requestVtecx(method, url, req, JSON.stringify(feed));
2661
+ }
2662
+ catch (e) {
2663
+ throw newFetchError(e, true);
2664
+ }
2203
2665
  //console.log(`[vtecxnext removealias] response=${response}`)
2204
2666
  // vte.cxからのset-cookieを転記
2205
2667
  setCookie(response, res);
@@ -2263,6 +2725,20 @@ class VtecxNextError extends Error {
2263
2725
  }
2264
2726
  }
2265
2727
  exports.VtecxNextError = VtecxNextError;
2728
+ /**
2729
+ * Fetch Error
2730
+ */
2731
+ class FetchError extends VtecxNextError {
2732
+ //url:string
2733
+ //requestInit:RequestInit
2734
+ constructor(message) {
2735
+ super(500, message);
2736
+ this.name = 'FetchError';
2737
+ //this.url = url
2738
+ //this.requestInit = requestInit
2739
+ }
2740
+ }
2741
+ exports.FetchError = FetchError;
2266
2742
  //---------------------------------------------
2267
2743
  /**
2268
2744
  * vte.cxへリクエスト
@@ -2319,7 +2795,31 @@ const fetchVtecx = async (method, url, headers, body, mode) => {
2319
2795
  if (mode) {
2320
2796
  requestInit['mode'] = mode;
2321
2797
  }
2322
- return fetch(`${process.env.VTECX_URL}${url}`, requestInit);
2798
+ return fetchProc(`${VTECX_URL}${url}`, requestInit);
2799
+ };
2800
+ /** vte.cx URL */
2801
+ const VTECX_URL = process.env.VTECX_URL ?? '';
2802
+ const newFetchError = (e, isVtecx) => {
2803
+ let errMsg;
2804
+ if (e instanceof Error) {
2805
+ const errName = isVtecx ? 'VtecxFetchError' : 'FetchError';
2806
+ errMsg = `${errName}: ${e.message}`;
2807
+ }
2808
+ else {
2809
+ errMsg = `Unexpected error.`;
2810
+ }
2811
+ console.log(`[vtecxnext fetchProc] errMsg = ${errMsg}`);
2812
+ return new FetchError(errMsg);
2813
+ };
2814
+ /**
2815
+ * fetch処理。try-catchを行う。
2816
+ * @param url URL
2817
+ * @param requestInit RequestInit
2818
+ * @returns Promise
2819
+ */
2820
+ const fetchProc = (url, requestInit) => {
2821
+ //console.log(`[vtecxnext fetchProc] url=${url}`)
2822
+ return fetch(url, requestInit);
2323
2823
  };
2324
2824
  /**
2325
2825
  * vte.cxからのset-cookieを、ブラウザへレスポンスする。
@@ -2383,7 +2883,7 @@ const checkVtecxResponse = async (response) => {
2383
2883
  if (data && data.feed) {
2384
2884
  message = data.feed.title;
2385
2885
  }
2386
- message = message ? message : `status=${response.status}`;
2886
+ message = message ?? `status=${response.status}`;
2387
2887
  throw new VtecxNextError(response.status, message);
2388
2888
  }
2389
2889
  };
@@ -2396,7 +2896,7 @@ const checkVtecxResponse = async (response) => {
2396
2896
  */
2397
2897
  const checkNotNull = (val, name) => {
2398
2898
  if (!val) {
2399
- throw new VtecxNextError(400, `${name ? name : 'Key'} is required.`);
2899
+ throw new VtecxNextError(400, `${name ?? 'Key'} is required.`);
2400
2900
  }
2401
2901
  };
2402
2902
  /**
@@ -2410,7 +2910,7 @@ const checkNotNull = (val, name) => {
2410
2910
  const checkUri = (str, name) => {
2411
2911
  checkNotNull(str, name);
2412
2912
  if (!str.startsWith('/')) {
2413
- throw new VtecxNextError(400, `${name ? name : 'Key'} must start with a slash.`);
2913
+ throw new VtecxNextError(400, `${name ?? 'Key'} must start with a slash.`);
2414
2914
  }
2415
2915
  };
2416
2916
  /**
@@ -2427,11 +2927,14 @@ const getJson = async (response) => {
2427
2927
  return await response.json();
2428
2928
  }
2429
2929
  catch (e) {
2930
+ let errMsg;
2430
2931
  if (e instanceof Error) {
2431
- const error = e;
2432
- //console.log(`[getJson] Error occured. ${error.name}: ${error.message}`)
2932
+ errMsg = `JsonError: ${e.message}`;
2433
2933
  }
2434
- return null;
2934
+ else {
2935
+ errMsg = `JsonError: unexpected error`;
2936
+ }
2937
+ throw new VtecxNextError(500, errMsg);
2435
2938
  }
2436
2939
  };
2437
2940
  /**
@@ -2519,7 +3022,13 @@ const oauth = async (req, res, provider, oauthUrl) => {
2519
3022
  // vte.cxへリクエスト (state取得)
2520
3023
  const method = 'POST';
2521
3024
  const url = `/o/${provider}/create_state`;
2522
- const response = await requestVtecx(method, url, req);
3025
+ let response;
3026
+ try {
3027
+ response = await requestVtecx(method, url, req);
3028
+ }
3029
+ catch (e) {
3030
+ throw newFetchError(e, true);
3031
+ }
2523
3032
  // レスポンスのエラーチェック
2524
3033
  await checkVtecxResponse(response);
2525
3034
  // 戻り値
@@ -2557,7 +3066,7 @@ const oauth = async (req, res, provider, oauthUrl) => {
2557
3066
  const oauthGetAccesstoken = async (req, res, provider, accesstokenUrl) => {
2558
3067
  //console.log(`[vtecxnext oauthGetAccesstoken] start. provider=${provider} oauthUrl=${accesstokenUrl}`)
2559
3068
  // stateチェック
2560
- const parseUrl = url_1.default.parse(req.url ? req.url : '', true);
3069
+ const parseUrl = url_1.default.parse(req.url ?? '', true);
2561
3070
  const state = parseUrl.query.state;
2562
3071
  const code = parseUrl.query.code;
2563
3072
  if (!state) {
@@ -2570,7 +3079,13 @@ const oauthGetAccesstoken = async (req, res, provider, accesstokenUrl) => {
2570
3079
  const vtecxMethod = 'POST';
2571
3080
  const vtecxUrl = `/o/${provider}/check_state?state=${state}`;
2572
3081
  //console.log(`[vtecxnext oauthGetAccesstoken] vtecxUrl=${vtecxUrl}`)
2573
- const vtecxResponse = await requestVtecx(vtecxMethod, vtecxUrl, req);
3082
+ let vtecxResponse;
3083
+ try {
3084
+ vtecxResponse = await requestVtecx(vtecxMethod, vtecxUrl, req);
3085
+ }
3086
+ catch (e) {
3087
+ throw newFetchError(e, true);
3088
+ }
2574
3089
  //console.log(`[vtecxnext oauthGetAccesstoken] check_state response status=${vtecxResponse.status}`)
2575
3090
  // vte.cxからのset-cookieを転記
2576
3091
  setCookie(vtecxResponse, res);
@@ -2608,7 +3123,13 @@ const oauthGetAccesstoken = async (req, res, provider, accesstokenUrl) => {
2608
3123
  body: accesstokenBody,
2609
3124
  method: accesstokenMethod
2610
3125
  };
2611
- const accesstokenResponse = await fetch(accesstokenUrl, requestInit);
3126
+ let accesstokenResponse;
3127
+ try {
3128
+ accesstokenResponse = await fetchProc(accesstokenUrl, requestInit);
3129
+ }
3130
+ catch (e) {
3131
+ throw newFetchError(e, false);
3132
+ }
2612
3133
  if (accesstokenResponse.status !== 200) {
2613
3134
  const errorInfo = await accesstokenResponse.json();
2614
3135
  //console.log(`[vtecxnext oauthGetAccesstoken] Get accesstoken failed. ${JSON.stringify(errorInfo)}`)
@@ -2646,7 +3167,13 @@ const oauthGetUserinfoLine = async (req, res, oauthInfo) => {
2646
3167
  headers: headers,
2647
3168
  method: method
2648
3169
  };
2649
- const response = await fetch(url, requestInit);
3170
+ let response;
3171
+ try {
3172
+ response = await fetchProc(url, requestInit);
3173
+ }
3174
+ catch (e) {
3175
+ throw newFetchError(e, false);
3176
+ }
2650
3177
  if (response.status !== 200) {
2651
3178
  throw new VtecxNextError(401, `Get user information failed. status=${response.status}`);
2652
3179
  }
@@ -2679,7 +3206,13 @@ const oauthLink = async (req, res, provider, userInfo) => {
2679
3206
  const method = 'POST';
2680
3207
  const url = `/o/${provider}/link?state=${userInfo.state}${param}`;
2681
3208
  const reqFeed = [{ 'title': userInfo.guid, 'subtitle': userInfo.nickname }];
2682
- const response = await fetchVtecx(method, url, {}, JSON.stringify(reqFeed));
3209
+ let response;
3210
+ try {
3211
+ response = await fetchVtecx(method, url, {}, JSON.stringify(reqFeed));
3212
+ }
3213
+ catch (e) {
3214
+ throw newFetchError(e, true);
3215
+ }
2683
3216
  const feed = await response.json();
2684
3217
  // vte.cxからのset-cookieを転記
2685
3218
  setCookie(response, res);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vtecx/vtecxnext",
3
- "version": "1.0.6",
3
+ "version": "1.0.7",
4
4
  "description": "vte.cx Next.js api",
5
5
  "main": "dist/index.js",
6
6
  "files": [