diff --git a/firefish-calls/createNote.mjs b/firefish-calls/createNote.mjs index 1543c79..7951b54 100644 --- a/firefish-calls/createNote.mjs +++ b/firefish-calls/createNote.mjs @@ -1,44 +1,29 @@ -import { apiKey } from './API.mjs' +import firefish from './firefish.mjs' import logger from '../logger.mjs' -//JUST FOR USE IN LOCAL ENVIRONMENT -import { Agent, setGlobalDispatcher } from 'undici' -const agent = new Agent({ - connect: { - rejectUnauthorized: false - } -}) -setGlobalDispatcher(agent) -//^^^JUST FOR USE IN LOCAL ENVIRONMENT^^^ +// //JUST FOR USE IN LOCAL ENVIRONMENT +// import { Agent, setGlobalDispatcher } from 'undici' +// const agent = new Agent({ +// connect: { +// rejectUnauthorized: false +// } +// }) +// setGlobalDispatcher(agent) +// //^^^JUST FOR USE IN LOCAL ENVIRONMENT^^^ + export default async function createNote(text) { - const childLogger = logger.child({text}) - childLogger.trace("createNote called") - const url = 'http://localhost:3000/api/notes/create' - const params = { + logger.trace("createNote called") + const body = { text: text, } - const headers = { - "Authorization": "Bearer " + apiKey, - "Content-type": "application/json; charset=UTF-8" + try { + const response = await firefish.post("notes/create",body) + logger.info(response) + return response.data + } catch (error) { + throw error } - return await fetch(url, { - method: "POST", - headers: headers, - body: JSON.stringify(params), - - - }) - .then(res => { - return res.json() - }) - .then(data => { - childLogger.trace(data, "note created successfully") - return data - }) - .catch(error =>{ - throw error - }) } diff --git a/firefish-calls/firefish.mjs b/firefish-calls/firefish.mjs new file mode 100644 index 0000000..d6a41e4 --- /dev/null +++ b/firefish-calls/firefish.mjs @@ -0,0 +1,12 @@ +import axios from "axios" + +const apiKey = "sdJSmZpT518eOsNJUyiGNKGwjrcsQE1d" + +export default axios.create({ + baseURL: "http://localhost:3000/api/", + //timeout:1000, + headers: { + "Authorization": "Bearer " + apiKey, + "Content-type": "application/json; charset=UTF-8" + } +}) \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a46f7d0..8ab272c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { + "axios": "^1.4.0", "body-parser": "^1.20.2", "express": "^4.18.2", "node-cron": "^3.0.2", @@ -228,6 +229,11 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/atomic-sleep": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz", @@ -236,6 +242,16 @@ "node": ">=8.0.0" } }, + "node_modules/axios": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz", + "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -416,6 +432,17 @@ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -483,6 +510,14 @@ "ms": "2.0.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -734,6 +769,38 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -1867,6 +1934,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", diff --git a/package.json b/package.json index bf9015e..87876b8 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "sqlite3": "^5.1.6" }, "dependencies": { + "axios": "^1.4.0", "body-parser": "^1.20.2", "express": "^4.18.2", "node-cron": "^3.0.2",