Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 55cd7dd

Browse files
EdamAme-xEdamAme-x
committed
chore: format
1 parent 1eac344 commit 55cd7dd

9 files changed

+61
-55
lines changed

‎src/base/index.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('PayPayError', () => {
88
test('PayPay Fail', async () => {
99
expect(await paypay.login()).toStrictEqual({
1010
success: false,
11-
status: PayPayStatus.LoginFailed
11+
status: PayPayStatus.LoginFailed,
1212
})
1313
})
1414
})

‎src/base/index.ts

+14-17
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ export class PayPay {
211211
'resultCode' in result['header'] &&
212212
'resultMessage' in result['header']
213213
) {
214-
if (
215-
result['header']['resultCode'] === 'S0001'
216-
) {
214+
if (result['header']['resultCode'] === 'S0001') {
217215
// Refresh
218216
await this.login({
219217
uuid: this.uuid,
@@ -302,7 +300,7 @@ export class PayPay {
302300

303301
return parseCreateLink(result, true)
304302
}
305-
303+
306304
async getLink(link: string): Promise<ResponseGetLink> {
307305
if (!this.isLogged()) {
308306
throw new PayPayError('Do not logged in', 2).fire()
@@ -370,7 +368,7 @@ export class PayPay {
370368
}
371369

372370
return parseReceiveLink(result, true)
373-
}catch (_e) {
371+
} catch (_e) {
374372
throw new PayPayError('Invalid link', 1).fire()
375373
}
376374
}
@@ -410,7 +408,6 @@ export class PayPay {
410408
}
411409

412410
async sendMoney(amount: number, external_id: string): Promise<ResponseBody> {
413-
414411
if (!this.isLogged()) {
415412
throw new PayPayError('Do not logged in', 2).fire()
416413
}
@@ -437,7 +434,7 @@ export class PayPay {
437434
'https://www.paypay.ne.jp/app/v2/p2p-api/executeP2PSendMoney',
438435
{
439436
method: 'POST',
440-
body: JSON.stringify(ctx),
437+
body: JSON.stringify(ctx),
441438
}
442439
)
443440

@@ -446,22 +443,25 @@ export class PayPay {
446443
}
447444

448445
if (result.header.resultCode === 'S9999') {
449-
throw new PayPayError('You\'re not friends with user', 1).fire()
446+
throw new PayPayError("You're not friends with user", 1).fire()
450447
}
451448

452449
return parseAny(result, true)
453450
}
454451

455-
async request(path: 'getProfileDisplayInfo' | 'getPay2BalanceHistory' | 'getPaymentMethodList'): Promise<ResponseAnyone> {
452+
async request(
453+
path: 'getProfileDisplayInfo' | 'getPay2BalanceHistory' | 'getPaymentMethodList'
454+
): Promise<ResponseAnyone> {
456455
if (!this.isLogged()) {
457456
throw new PayPayError('Do not logged in', 2).fire()
458457
}
459458

460459
const { response, result } = await this.baseFetch(
461460
`https://www.paypay.ne.jp/app/v2/bff/${path}`,
462-
{
463-
method: 'GET'
464-
})
461+
{
462+
method: 'GET',
463+
}
464+
)
465465

466466
if (!response.ok) {
467467
return parseAny(result, false)
@@ -496,19 +496,16 @@ export class PayPayRecovery {
496496
public password: string
497497
public uuid: string
498498

499-
constructor(
500-
code: string
501-
) {
499+
constructor(code: string) {
502500
const object = unparseRecoveryCode(code)
503501
this.phone = object.phone
504502
this.password = object.password
505503
this.uuid = object.uuid ?? randomUUID()
506504
}
507505

508506
async recovery(): Promise<PayPay> {
509-
510507
const paypay = new PayPay(this.phone, this.password)
511-
508+
512509
const result = await paypay.login({
513510
uuid: this.uuid,
514511
})

‎src/types.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ export type ReceiveLinkContext = {
5252
}
5353

5454
export type SendMoneyContext = {
55-
theme: string,
56-
externalReceiverId: string,
57-
amount: number,
58-
requestId: string,
59-
requestAt: string,
60-
iosMinimumVersion: string,
55+
theme: string
56+
externalReceiverId: string
57+
amount: number
58+
requestId: string
59+
requestAt: string
60+
iosMinimumVersion: string
6161
androidMinimumVersion: string
6262
}
6363

@@ -190,4 +190,4 @@ export type ResponseAnyone = {
190190
[key: string]: Anyone
191191
}
192192
}
193-
}
193+
}

‎src/utils/is.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ describe('Util', () => {
3737
},
3838
payload: {
3939
paypay: 'resultCode',
40-
oosugi: 'dounikashite'
41-
}
40+
oosugi: 'dounikashite',
41+
},
4242
}
43-
43+
4444
const invalidSuccess = {
4545
header: {
4646
resultCode: 'S0001',
4747
resultMessage: 'Invalid anyone',
4848
},
4949
payload: {
5050
paypay: 'resultCode',
51-
oosugi: 'dounikashite'
52-
}
51+
oosugi: 'dounikashite',
52+
},
5353
}
5454

5555
expect(util.isSuccess(validSuccess)).toBeTruthy()

‎src/utils/is.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,16 @@ export function isUuid(uuid: string): boolean {
5151
return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(uuid)
5252
}
5353

54-
5554
export function isSuccess(raw: {
5655
header: {
5756
resultCode: string
5857
resultMessage: string
59-
},
58+
}
6059
payload: Anyone
6160
}): boolean {
6261
try {
6362
return raw.header.resultCode === 'S0000'
64-
}catch (e) {
63+
} catch (e) {
6564
return false
6665
}
67-
}
66+
}

‎src/utils/parse.test.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ describe('Util', () => {
1616
const password = 'ctkpaarR2'
1717
const uuid = 'a9b3d5c6-7d8e-9f0a-bcde-fghijk'
1818

19-
expect(util.parseRecoveryCode(phone, password, uuid)).toBe('eyJhbGcMDkwMTkxOTQ1NDU=.Y3RrcGFhclIy.YTliM2Q1YzYtN2Q4ZS05ZjBhLWJjZGUtZmdoaWpr')
19+
expect(util.parseRecoveryCode(phone, password, uuid)).toBe(
20+
'eyJhbGcMDkwMTkxOTQ1NDU=.Y3RrcGFhclIy.YTliM2Q1YzYtN2Q4ZS05ZjBhLWJjZGUtZmdoaWpr'
21+
)
2022
})
2123

2224
test('unparseRecoveryCode', () => {
@@ -37,8 +39,8 @@ describe('Util', () => {
3739
},
3840
payload: {
3941
paypay: 'resultCode',
40-
oosugi: 'dounikashite'
41-
}
42+
oosugi: 'dounikashite',
43+
},
4244
}
4345

4446
expect(util.parseBalanceContext(failResponse, false)).toStrictEqual({
@@ -47,7 +49,7 @@ describe('Util', () => {
4749
total: 0,
4850
currency: 'JPY',
4951
updated_at: new Date(0).toISOString(),
50-
raw: failResponse
52+
raw: failResponse,
5153
})
5254
})
5355

@@ -59,8 +61,8 @@ describe('Util', () => {
5961
},
6062
payload: {
6163
paypay: 'resultCode',
62-
oosugi: 'dounikashite'
63-
}
64+
oosugi: 'dounikashite',
65+
},
6466
}
6567

6668
expect(util.parseResultMessage(eg1)).toBe('Example 1')
@@ -69,8 +71,8 @@ describe('Util', () => {
6971
header: {},
7072
payload: {
7173
paypay: 'resultCode',
72-
oosugi: 'dounikashite'
73-
}
74+
oosugi: 'dounikashite',
75+
},
7476
}
7577

7678
expect(util.parseResultMessage(eg2)).toBe('unknown')

‎src/utils/parse.ts

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
import { PayPayError, isSuccess } from '..'
2-
import type { Anyone, ResponseAnyone, ResponseBalance, ResponseCreateLink, ResponseGetLink, ResponseReceiveLink, ResponseUserInfo } from '../types'
2+
import type {
3+
Anyone,
4+
ResponseAnyone,
5+
ResponseBalance,
6+
ResponseCreateLink,
7+
ResponseGetLink,
8+
ResponseReceiveLink,
9+
ResponseUserInfo,
10+
} from '../types'
311

412
export function parseCookieFromMap(map: Map<string, string>): string {
513
return Array.from(map.entries())
@@ -62,7 +70,7 @@ export function parseBalanceContext(result: Anyone, success: boolean): ResponseB
6270
updated_at: new Date(0).toISOString(),
6371
raw: result,
6472
}
65-
}catch (_e) {
73+
} catch (_e) {
6674
return {
6775
success: false,
6876
message: parseResultMessage(result),
@@ -92,7 +100,7 @@ export function parseUserInfoContext(result: Anyone, success: boolean): Response
92100
external_id: result.payload.external_id ?? 'unknown',
93101
raw: result,
94102
}
95-
}catch (_e) {
103+
} catch (_e) {
96104
return {
97105
success: false,
98106
message: parseResultMessage(result),
@@ -124,7 +132,7 @@ export function parseCreateLink(result: Anyone, success: boolean): ResponseCreat
124132
expiry: result.payload.expiry ?? new Date(0).toISOString(),
125133
raw: result,
126134
}
127-
}catch (_e) {
135+
} catch (_e) {
128136
return {
129137
success: false,
130138
message: parseResultMessage(result),
@@ -160,7 +168,7 @@ export function parseGetLink(result: Anyone, success: boolean): ResponseGetLink
160168
raw: result,
161169
}
162170
}
163-
171+
164172
return {
165173
success: success && isSuccess(result),
166174
message: parseResultMessage(result),
@@ -179,7 +187,7 @@ export function parseGetLink(result: Anyone, success: boolean): ResponseGetLink
179187
photo_url: result.payload.sender.photoUrl ?? 'unknown',
180188
raw: result,
181189
}
182-
}catch (_e) {
190+
} catch (_e) {
183191
return {
184192
success: false,
185193
message: parseResultMessage(result),
@@ -237,4 +245,4 @@ export function parseAny(result: Anyone, success: boolean): ResponseAnyone {
237245
raw: result,
238246
}
239247
}
240-
}
248+
}

‎src/utils/uuid.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { isUuid } from './is'
22
import { randomUUID } from './uuid'
33

44
describe('UUIDError', () => {
5-
65
test('UUID', async () => {
76
expect(isUuid(randomUUID())).toBeTruthy()
87
})

‎src/utils/uuid.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export function randomUUID() {
2-
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (a) => {
3-
const r = (new Date().getTime() + Math.random() * 16) % 16 | 0, v = a == 'x' ? r : (r & 0x3 | 0x8)
4-
return v.toString(16)
5-
})
6-
}
2+
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (a) => {
3+
const r = (new Date().getTime() + Math.random() * 16) % 16 | 0,
4+
v = a == 'x' ? r : (r & 0x3) | 0x8
5+
return v.toString(16)
6+
})
7+
}

0 commit comments

Comments
 (0)