Skip to content

Commit

Permalink
Make bin lookup more clear
Browse files Browse the repository at this point in the history
  • Loading branch information
@confused-Techie
confused-Techie committed Feb 2, 2024
1 parent 198ad6e commit 8c72a28
Show file tree
Hide file tree
Showing 2 changed files with 149 additions and 174 deletions.
88 changes: 88 additions & 0 deletions microservices/download/bins.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// A module that defines the way we locate a specific binary file amid all possible
// Pulsar Rolling Release binaries.
// In order to do this the following keys are available:
// - startsWith: Checks if the version string startsWith the value
// - endsWith: Checks if the version string endsWith the value
// - endsWithNot: Checks if the version string does not end with the value

module.exports = {
windows: {
windows_setup: {
startsWith: "Pulsar.Setup",
endsWith: ".exe"
},
windows_portable: {
endsWith: "-win.zip"
},
windows_blockmap: {
startsWith: "Pulsar.Setup",
endsWith: ".exe.blockmap"
}
},

silicon_mac: {
mac_zip: {
endsWith: "-arm64-mac.zip"
},
mac_zip_blockmap: {
endsWith: "-arm64-mac.zip.blockmap"
},
mac_dmg: {
endsWith: "-arm64.dmg"
},
mac_dmg_blockmap: {
endsWith: "-arm64.dmg.blockmap"
}
},

intel_mac: {
mac_zip: {
endsWith: "-mac.zip",
endsWithNot: "-arm64-mac.zip"
},
mac_zip_blockmap: {
endsWith: "-mac.zip.blockmap",
endsWithNot: "-arm64-mac.zip.blockmap"
},
mac_dmg: {
endsWith: ".dmg",
endsWithNot: "-arm64.dmg"
},
mac_dmg_blockmap: {
endsWith: ".dmg.blockmap",
endsWithNot: "-arm64.dmg.blockmap"
}
},

arm_linux: {
linux_appimage: {
endsWith: "-arm64.AppImage"
},
linux_tar: {
endsWith: "-arm64.tar.gz"
},
linux_rpm: {
endsWith: ".aarch64.rpm"
},
linux_deb: {
endsWith: "_arm64.deb"
}
},

linux: {
linux_appimage: {
endsWith: ".AppImage",
endsWithNot: "-arm64.AppImage"
},
linux_tar: {
endsWith: ".tar.gz",
endsWithNot: "-arm64.tar.gz"
},
linux_rpm: {
endsWith: ".x86_64.rpm"
},
linux_deb: {
endsWith: "_amd64.deb"
}
}
};
235 changes: 61 additions & 174 deletions microservices/download/utils.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
const https = require("node:https");
const bins = require("./bins.js");
let TOKEN = process.env.GH_TOKEN_DOWNLOAD_MICROSERVICE;

const VALID_OS = [ "linux", "arm_linux", "silicon_mac", "intel_mac", "windows" ];
const VALID_TYPE = [
"linux_appimage",
"linux_tar",
"linux_rpm",
"linux_deb",
"windows_setup",
"windows_portable",
"windows_blockmap",
"mac_zip",
"mac_zip_blockmap",
"mac_dmg",
"mac_dmg_blockmap"
];

// Environment Variables Check

if (typeof TOKEN === "undefined") {
Expand All @@ -9,7 +25,7 @@ if (typeof TOKEN === "undefined") {
TOKEN = "123456";
} else {
// We are not in dev mode. Our secrets are gone and the application will fail to work
console.log("Missing Required Environment Variables! Something has gone wrong!");
console.log("Missing Required Environment Variable: 'GH_TOKEN_DOWNLOAD_MICROSERVICE'!");
process.exit(1);
}
}
Expand Down Expand Up @@ -49,8 +65,8 @@ function doRequest() {
});
};

function query_os(req) {
let raw = req; // The URL string containing any number of query params.
function query_os(param) {
let raw = param; // The query string. From the URL string split by `?`
let prov = undefined;

if (typeof raw !== "string") {
Expand All @@ -70,13 +86,11 @@ function query_os(req) {
return false;
}

let valid = [ "linux", "arm_linux", "silicon_mac", "intel_mac", "windows" ];

return valid.includes(prov) ? prov : false;
return VALID_OS.includes(prov) ? prov : false;
}

function query_type(req) {
let raw = req;
function query_type(param) {
let raw = param;
let prov = undefined;

let full = raw.split("&");
Expand All @@ -92,21 +106,7 @@ function query_type(req) {
return false;
}

let valid = [
"linux_appimage",
"linux_tar",
"linux_rpm",
"linux_deb",
"windows_setup",
"windows_portable",
"windows_blockmap",
"mac_zip",
"mac_zip_blockmap",
"mac_dmg",
"mac_dmg_blockmap"
];

return valid.includes(prov) ? prov : false;
return VALID_TYPE.includes(prov) ? prov : false;
}

async function displayError(req, res, errMsg) {
Expand Down Expand Up @@ -160,157 +160,8 @@ async function findLink(os, type) {
continue;
}

if (os === "windows") {
if (
type === "windows_setup" &&
name.startsWith("Pulsar.Setup") &&
name.endsWith(".exe")
) {

return returnObj;

} else if (
type === "windows_portable" &&
name.endsWith("-win.zip")
) {

return returnObj;

} else if (
type === "windows_blockmap" &&
name.startsWith("Pulsar.Setup") &&
name.endsWith(".exe.blockmap")
) {

return returnObj;

}
} else if (os === "silicon_mac") {
if (
type === "mac_zip" &&
name.endsWith("-arm64-mac.zip")
) {

return returnObj;

} else if (
type === "mac_zip_blockmap" &&
name.endsWith("-arm64-mac.zip.blockmap")
) {

return returnObj;

} else if (
type === "mac_dmg" &&
name.endsWith("-arm64.dmg")
) {

return returnObj;

} else if (
type === "mac_dmg_blockmap" &&
name.endsWith("-arm64.dmg.blockmap")
) {

return returnObj;

}
} else if (os === "intel_mac") {
if (
type === "mac_zip" &&
name.endsWith("-mac.zip") &&
!name.endsWith("-arm64-mac.zip")
) {

return returnObj;

} else if (
type === "mac_zip_blockmap" &&
name.endsWith("-mac.zip.blockmap") &&
!name.endsWith("-arm64-mac.zip.blockmap")
) {

return returnObj;

} else if (
type === "mac_dmg" &&
name.endsWith(".dmg") &&
!name.endsWith("-arm64.dmg")
) {

return returnObj;

} else if (
type === "mac_dmg_blockmap" &&
name.endsWith(".dmg.blockmap") &&
!name.endsWith("-arm64.dmg.blockmap")
) {

return returnObj;

}
} else if (os === "arm_linux") {
if (
type === "linux_appimage" &&
name.endsWith("-arm64.AppImage")
) {

return returnObj;

} else if (
type === "linux_tar" &&
name.endsWith("-arm64.tar.gz")
) {

return returnObj;

} else if (
type === "linux_rpm" &&
name.endsWith(".aarch64.rpm")
) {

return returnObj;

} else if (
type === "linux_deb" &&
name.endsWith("_arm64.deb")
) {

return returnObj;

}
} else if (os === "linux") {
if (
type === "linux_appimage" &&
name.endsWith(".AppImage") &&
!name.endsWith("-arm64.AppImage")
) {

return returnObj;

} else if (
type === "linux_tar" &&
name.endsWith(".tar.gz") &&
!name.endsWith("-arm64.tar.gz")
) {

return returnObj;

} else if (
type === "linux_rpm" &&
name.endsWith(".x86_64.rpm")
) {

return returnObj;

} else if (
type === "linux_deb" &&
name.endsWith("_amd64.deb")
) {

return returnObj;

}
if (stringMatchesBin(name, bins[os][type])) {
return returnObj;
}

}
Expand All @@ -336,6 +187,42 @@ async function findLink(os, type) {
}
}

function stringMatchesBin(str, bin = {}) {
// Takes an object from the `bins.js` file and checks it against the provided
// string.

let checkCount = 0;
let passingCheckCount = 0;

if (typeof bin.startsWith === "string") {
checkCount++;
if (str.startsWith(bin.startsWith)) {
passingCheckCount++;
}
}

if (typeof bin.endsWith === "string") {
checkCount++;
if (str.endsWith(bin.endsWith)) {
passingCheckCount++;
}
}

if (typeof bin.endsWithNot === "string") {
checkCount++;
if (!str.endsWith(bin.endsWithNot)) {
passingCheckCount++;
}
}

if (passingCheckCount === checkCount && checkCount != 0) {
// if we passed all checks, and there were actual checks
return true;
} else {
return false;
}
}

module.exports = {
query_os,
query_type,
Expand Down

0 comments on commit 8c72a28

Please sign in to comment.