@neosmart/ssclient 2.0.0 → 2.0.1-beta.1

package/install.js

@@ -28,17 +28,18 @@ const __dirname = dirname(__filename);
  * @property {Record<string, string | string[] | BuildEntry>} precompiled - Mapping of os-arch to builds
  */
 
+const BIN_NAME = "ssclient";
+const VERSION = pkg.version.replace(/[+-].*/, "");
 const MANIFEST_URLS = [
   `${__dirname}/manifest.json`,
   `https://raw.githubusercontent.com/neosmart/securestore-rs/refs/heads/master/ssclient/npm/manifests/v${pkg.version}.json`,
-  `https://neosmart.net/SecureStore/ssclient/npm/manifests/v${pkg.version}.json`,
-  `https://raw.githubusercontent.com/neosmart/securestore-rs/refs/tags/ssclient/${pkg.version}/ssclient/npm/manifests/v${pkg.version}.json`,
+  `https://raw.githubusercontent.com/neosmart/securestore-rs/refs/heads/master/ssclient/npm/manifests/v${VERSION}.json`,
+  `https://neosmart.net/SecureStore/ssclient/npm/manifests/v${VERSION}.json`,
+  `https://raw.githubusercontent.com/neosmart/securestore-rs/refs/tags/${BIN_NAME}/${VERSION}/ssclient/npm/manifests/v${VERSION}.json`,
 ];
-const BIN_NAME = "ssclient";
 const PKG_ROOT = __dirname;
 const FALLBACK_JS = join(PKG_ROOT, "ssclient.js");
 const BASE_BIN_DIR = join(PKG_ROOT, "bin");
-const VERSION = pkg.version;
 const VERSIONED_DIR = join(BASE_BIN_DIR, `v${VERSION}`);
 const ENTRY_POINT = join(__dirname, pkg.bin[BIN_NAME]);
 
@@ -198,8 +199,10 @@ async function linkBinary(target, linkPath) {
     // Don't check if it exists first because we need to also remove broken symlinks
     await unlink(linkPath);
   } catch (err) {
-    console.error(`Failed to remove existing binary: ${err}`);
-    throw err;
+    if (existsSync(linkPath)) {
+      console.error(`Failed to remove existing binary: ${err}`);
+      throw err;
+    }
   }
 
   const rel = relative(dirname(linkPath), target);
@@ -246,6 +249,9 @@ async function resolve(pathOrUrl, result) {
     if (!response.ok) {
       throw new Error(`HTTP Error: ${response.status} ${response.statusText}`);
     }
+    if (/html/i.test(response.headers.get("content-type") ?? "")) {
+      throw new Error("Unexpected HTML in response!");
+    }
     return result === "text" ? await response.text() : await response.json();
   } else if (existsSync(pathOrUrl)) {
     const text = await readFile(pathOrUrl, { encoding: "utf8" });
@@ -264,8 +270,14 @@ async function main() {
 
     /** @type {Manifest} */
     const manifest = await (async () => {
+      /** @type {string | undefined} */
+      let last;
       for (const url of MANIFEST_URLS) {
+        if (url === last) {
+          continue;
+        }
         try {
+          last = url;
           const manifest = await resolve(url, "json");
           return manifest;
         } catch {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neosmart/ssclient",
   "description": "SecureStore cli client, cross-platform and sandboxed",
-  "version": "2.0.0",
+  "version": "2.0.1-beta.1",
   "keywords": [
     "SecureStore",
     "encryption",
@@ -30,20 +30,16 @@
     "./build.js",
     "./install.js",
     "./ssclient.js",
-    "./tsconfig.js"
+    "./tsconfig.json"
   ],
   "type": "module",
   "scripts": {
-    "prepublishOnly": "npm run lint && npm run build",
-    "prepare": "echo 'This placeholder file will be overridden by our install scripts' > bin/ssclient.cmd",
+    "prepack": "npm run lint && npm run build && echo 'This placeholder file will be overridden by our install scripts' > bin/ssclient.cmd",
     "install": "node ./install.js",
     "ssclient": "node ./ssclient.js",
     "build": "node ./build.js",
     "lint": "tsc"
   },
-  "devDependecies": [
-    "@types/node"
-  ],
   "devDependencies": {
     "@types/node": "^22.0.0",
     "typescript": "^6.0.2"

package/tsconfig.json

@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "lib": [ "ES2022", "dom" ],
+    "types": [ "node" ],
+    "target": "ES2022",
+    "module": "Preserve",
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitOverride": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noPropertyAccessFromIndexSignature": true
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}