From 189de6c0fb00af4257f91a06935f1b7eaa3240e9 Mon Sep 17 00:00:00 2001 From: Alvar San Martin Date: Mon, 4 May 2026 15:12:53 +0200 Subject: [PATCH] =?UTF-8?q?La=20conexi=C3=B3n=20con=20alai=20funciona?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/sim-alai/New Order.yml | 3 ++- docs/sim-alai/SIM.yml | 22 +++++++++++++++++ docs/sim-api/Alai/Preactivate.bru | 16 +++++++++++++ docs/sim-api/Alai/Select SIM.bru | 20 ++++++++++++++++ docs/sim-api/Alai/folder.bru | 8 +++++++ docs/sim-api/environments/local.bru | 1 + .../certificates/.debugToken | 2 +- .../sim-consumidor-alai/config/env/env.ts | 5 ++-- packages/sim-consumidor-alai/index.ts | 8 +++++-- .../infrastructure/AlaiRepository.ts | 2 +- .../sim-shared/infrastructure/HTTPClient.ts | 2 +- yarn.lock | 24 +++++++++++++++++++ 12 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 docs/sim-alai/SIM.yml create mode 100644 docs/sim-api/Alai/Preactivate.bru create mode 100644 docs/sim-api/Alai/Select SIM.bru create mode 100644 docs/sim-api/Alai/folder.bru diff --git a/docs/sim-alai/New Order.yml b/docs/sim-alai/New Order.yml index e342c26..f38a0c5 100644 --- a/docs/sim-alai/New Order.yml +++ b/docs/sim-alai/New Order.yml @@ -6,7 +6,8 @@ info: http: method: POST url: "{{baseurl}}/v1/order" - auth: inherit + auth: + type: bearer settings: encodeUrl: true diff --git a/docs/sim-alai/SIM.yml b/docs/sim-alai/SIM.yml new file mode 100644 index 0000000..ac38dd9 --- /dev/null +++ b/docs/sim-alai/SIM.yml @@ -0,0 +1,22 @@ +info: + name: SIM + type: http + seq: 4 + +http: + method: GET + url: "{{baseurl}}/v1/sim/{{iccid}}" + auth: + type: bearer + token: "" + +runtime: + variables: + - name: iccid + value: "8934909001500561503" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/docs/sim-api/Alai/Preactivate.bru b/docs/sim-api/Alai/Preactivate.bru new file mode 100644 index 0000000..9a07b43 --- /dev/null +++ b/docs/sim-api/Alai/Preactivate.bru @@ -0,0 +1,16 @@ +meta { + name: Preactivate + type: http + seq: 2 +} + +get { + url: {{baseAlai}}/preactivate + body: none + auth: inherit +} + +settings { + encodeUrl: true + timeout: 0 +} diff --git a/docs/sim-api/Alai/Select SIM.bru b/docs/sim-api/Alai/Select SIM.bru new file mode 100644 index 0000000..7fe0f84 --- /dev/null +++ b/docs/sim-api/Alai/Select SIM.bru @@ -0,0 +1,20 @@ +meta { + name: Select SIM + type: http + seq: 1 +} + +get { + url: {{baseAlai}}/select/?iccid=8934909001500561503 + body: none + auth: inherit +} + +params:query { + iccid: 8934909001500561503 +} + +settings { + encodeUrl: true + timeout: 0 +} diff --git a/docs/sim-api/Alai/folder.bru b/docs/sim-api/Alai/folder.bru new file mode 100644 index 0000000..acad99f --- /dev/null +++ b/docs/sim-api/Alai/folder.bru @@ -0,0 +1,8 @@ +meta { + name: Alai + seq: 15 +} + +auth { + mode: inherit +} diff --git a/docs/sim-api/environments/local.bru b/docs/sim-api/environments/local.bru index fab4907..04056b4 100644 --- a/docs/sim-api/environments/local.bru +++ b/docs/sim-api/environments/local.bru @@ -1,4 +1,5 @@ vars { baseurl: http://localhost:3000 + baseAlai: http://localhost:3002 } color: #2E8A54 diff --git a/packages/sim-consumidor-alai/certificates/.debugToken b/packages/sim-consumidor-alai/certificates/.debugToken index 06ce4eb..ce3d0ee 100644 --- a/packages/sim-consumidor-alai/certificates/.debugToken +++ b/packages/sim-consumidor-alai/certificates/.debugToken @@ -1 +1 @@ -eyJhbGciOiJIUzM4NCJ9.eyJiciI6InNhdmVmYW1pbHkiLCJpcCI6IjUyLjIxNC4xMTIuMTgxIiwic3ViIjoiaW5mb3NhdmVmYW1pbHkiLCJzIjoiRVdTMTY0NjI4YjE0MmRlZWI3IiwicG9zIjoic2F2ZWZhbWlseUNhYyIsImlkV3NVc2VyIjoiODkiLCJpc012bmEiOmZhbHNlLCJkb21haW4iOiJBbGFpfHNhdmVmYW1pbHkiLCJpYXQiOjE3Nzc4OTA0ODEsImV4cCI6MTc3NzkwMTI4MX0.SNO14ONoayy7MEnauSsT7H4To7bbW_GYTq1ZvC2IdcdHZq8oOLlVPAJyu3uMXHRk +eyJhbGciOiJIUzM4NCJ9.eyJiciI6InNhdmVmYW1pbHkiLCJpcCI6Ijg4LjE1LjE1Ny4xNjciLCJzdWIiOiJwYWxvbWFpYmFuZXoiLCJzIjoiRVdTMTY0NmFmNjNlZGUyMjgzIiwicG9zIjoic2F2ZWZhbWlseUNhYyIsImlkV3NVc2VyIjoiODYiLCJpc012bmEiOmZhbHNlLCJkb21haW4iOiJBbGFpfHNhdmVmYW1pbHkiLCJpYXQiOjE3Nzc4OTk3MzcsImV4cCI6MTc3NzkxMDUzN30.PvTTRhUpKlslGOerQsLY4RLBXdQ5FIVvUKb_1ZK4b2Zggt04KZhwX0d-XoLAcP93 diff --git a/packages/sim-consumidor-alai/config/env/env.ts b/packages/sim-consumidor-alai/config/env/env.ts index 45a155f..ef9ed13 100644 --- a/packages/sim-consumidor-alai/config/env/env.ts +++ b/packages/sim-consumidor-alai/config/env/env.ts @@ -14,6 +14,7 @@ try { console.error("Error cargando el .env desde ./.env") } + export const env = { ENVIRONMENT: process.env.ENVIORMENT, POSTGRES_USER: process.env.POSTGRES_USER, @@ -32,8 +33,8 @@ export const env = { RABBITMQ_RETRY_INTERVAL: process.env.RABBITMQ_INTERVAL, RABBITMQ_VHOST: String(process.env.RABBITMQ_VHOST), - ALAI_PORT: Number(process.env.APP_PORT), - ALAI_HOST: String(process.env.APP_HOST), + ALAI_PORT: parseInt(process.env.ALAI_PORT ?? "3002"), + ALAI_HOST: String(process.env.ALAI_HOST), // ESPECIFICO ALAI ALAI_API_URL: process.env.ALAI_API_URL, diff --git a/packages/sim-consumidor-alai/index.ts b/packages/sim-consumidor-alai/index.ts index 898a3f2..b5c30ee 100644 --- a/packages/sim-consumidor-alai/index.ts +++ b/packages/sim-consumidor-alai/index.ts @@ -52,8 +52,13 @@ async function startWorker() { // WIP app.get("/select", alaiController.selectREST()) + app.get("/health", + (req, res) => res.json({ + ok: "alai" + })) //app.get("/selectPage", alaiController.selectPageREST()) + console.log(PORT, HOSTNAME) app.listen(PORT, HOSTNAME, (e) => { if (e == undefined) { console.log("[o] Servidor (Alai) iniciado en el puerto %d", PORT) @@ -61,7 +66,6 @@ async function startWorker() { console.error("Error express ", e) } }) - } startWorker() @@ -69,7 +73,7 @@ startWorker() console.log("[o] Worker de SIM de Alai iniciado") }) .catch(e => { - console.log("[x] Error iniciando worker de SIM de Alai") + console.log("[x] Error iniciando worker de SIM de Alai", e) }) export default {} diff --git a/packages/sim-consumidor-alai/infrastructure/AlaiRepository.ts b/packages/sim-consumidor-alai/infrastructure/AlaiRepository.ts index 671f9f0..ae5523f 100644 --- a/packages/sim-consumidor-alai/infrastructure/AlaiRepository.ts +++ b/packages/sim-consumidor-alai/infrastructure/AlaiRepository.ts @@ -108,7 +108,7 @@ export class AlaiRepository { public async getSimByICCID(iccid: string) { const endpoint = `/v1/sim/${iccid}` - const promReq = this.httpClient.post(endpoint, undefined) + const promReq = this.httpClient.get(endpoint, undefined) const res = await this.manageRequest(promReq) return res } diff --git a/packages/sim-shared/infrastructure/HTTPClient.ts b/packages/sim-shared/infrastructure/HTTPClient.ts index b8b5da8..71607a7 100644 --- a/packages/sim-shared/infrastructure/HTTPClient.ts +++ b/packages/sim-shared/infrastructure/HTTPClient.ts @@ -23,7 +23,7 @@ export class HttpClient { headers: Record, jwtManager: JWTProvider<{}>, // todo: asociar el tipo de token jwtService?: IJWTService, - httpsAgent: https.Agent + httpsAgent?: https.Agent }) { this.client = axios.create({ baseURL: args.baseURL, diff --git a/yarn.lock b/yarn.lock index 36d0a34..49d4cbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2943,6 +2943,30 @@ __metadata: languageName: node linkType: hard +"sim-consumidor-alai@workspace:packages/sim-consumidor-alai": + version: 0.0.0-use.local + resolution: "sim-consumidor-alai@workspace:packages/sim-consumidor-alai" + dependencies: + "@tsconfig/node22": "npm:*" + "@types/amqplib": "npm:^0.10.8" + "@types/cors": "npm:*" + "@types/express": "npm:*" + "@types/node": "npm:*" + "@types/supertest": "npm:*" + amqplib: "npm:^0.10.9" + cors: "npm:*" + dotenv: "npm:*" + express: "npm:*" + prettier: "npm:*" + sim-shared: "sim-shared:*" + supertest: "npm:*" + tsc-alias: "npm:^1.8.16" + tsx: "npm:*" + typescript: "npm:*" + vitest: "npm:*" + languageName: unknown + linkType: soft + "sim-consumidor-nos@workspace:packages/sim-consumidor-nos": version: 0.0.0-use.local resolution: "sim-consumidor-nos@workspace:packages/sim-consumidor-nos"