@shivam995364/uplink-nodejs-test 0.1.0-beta.4 → 0.1.0-beta.6

package/Makefile

@@ -1,8 +1,15 @@
 # Makefile for uplink-nodejs
 # Works on: Linux, macOS, Windows (CMD, PowerShell, MinGW/MSYS2)
 #
-# Installation Options:
-#   make install              - Auto-detect best installation method
+# Installation (one command):
+#   npm install @shivam995364/uplink-nodejs-test                           # auto-detect
+#   UPLINK_INSTALL=prebuilt npm install @shivam995364/uplink-nodejs-test   # prebuilt only
+#   UPLINK_INSTALL=hybrid  npm install @shivam995364/uplink-nodejs-test    # download lib + compile
+#   UPLINK_INSTALL=source  npm install @shivam995364/uplink-nodejs-test    # full source build
+#   UPLINK_INSTALL=skip    npm install @shivam995364/uplink-nodejs-test    # skip native build
+#
+# Direct Make Usage:
+#   make install              - Auto-detect (prebuilt → hybrid → source)
 #   make install-source       - Build everything from source (requires Go)
 #   make install-hybrid       - Download lib, build addon (requires C compiler)
 #   make install-prebuilt     - Download everything (Node.js only)
@@ -353,10 +360,32 @@ clean-all: clean
 npm-install:
 	npm install
 
-# Install native binaries (auto-detect best method)
+# Install native binaries
+# Reads UPLINK_INSTALL env var to select method:
+#   UPLINK_INSTALL=prebuilt  → shipped binaries only (no compiler)
+#   UPLINK_INSTALL=hybrid    → download lib + compile addon (C compiler)
+#   UPLINK_INSTALL=source    → build everything from source (Go + C)
+#   UPLINK_INSTALL=skip      → skip native build entirely
+#   (unset / auto)           → auto-detect: prebuilt → hybrid → source
+#
+# Usage:
+#   make install                          # auto-detect
+#   UPLINK_INSTALL=prebuilt make install  # prebuilt only
+#   npm install pkg                       # auto (postinstall calls make install)
+#   UPLINK_INSTALL=source npm install pkg # source build
 .PHONY: install
 install:
+ifeq ($(UPLINK_INSTALL),prebuilt)
+	@$(MAKE) install-prebuilt-shipped
+else ifeq ($(UPLINK_INSTALL),hybrid)
+	@$(MAKE) install-hybrid
+else ifeq ($(UPLINK_INSTALL),source)
+	@$(MAKE) install-source
+else ifeq ($(UPLINK_INSTALL),skip)
+	$(Q)echo "[uplink-nodejs] Skipping native build (UPLINK_INSTALL=skip)"
+else
 	@$(MAKE) install-auto
+endif
 
 # Lint
 .PHONY: lint
@@ -791,7 +820,44 @@ endif
 	$(Q)echo "╚══════════════════════════════════════════════════════════════╝"
 	$(Q)echo ""
 
+# Check if shipped prebuilt binaries exist and work (no download needed)
+.PHONY: install-prebuilt-shipped
+install-prebuilt-shipped:
+	$(Q)echo ""
+	$(Q)echo "╔══════════════════════════════════════════════════════════════╗"
+	$(Q)echo "║  Prebuilt: Using shipped binaries (no compilation)           ║"
+	$(Q)echo "╚══════════════════════════════════════════════════════════════╝"
+	$(Q)echo ""
+	$(Q)echo "Platform: $(PLATFORM)"
+	$(Q)echo "Checking: $(PLATFORM_DIR)"
+	$(Q)echo ""
+ifdef WINDOWS_NATIVE
+	$(Q)if exist "$(subst /,\,$(PLATFORM_DIR)/$(LIB_NAME))" if exist "$(subst /,\,$(PLATFORM_DIR)/$(NODE_ADDON))" ( \
+		echo "✓ $(LIB_NAME) found" && \
+		echo "✓ $(NODE_ADDON) found" && \
+		echo "" && \
+		echo "╔══════════════════════════════════════════════════════════════╗" && \
+		echo "║  ✓ Prebuilt binaries ready — no compilation needed!          ║" && \
+		echo "╚══════════════════════════════════════════════════════════════╝" \
+	) else ( \
+		echo "✗ Prebuilt binaries not found for $(PLATFORM)" && exit 1 \
+	)
+else
+	@if [ -f "$(PLATFORM_DIR)/$(LIB_NAME)" ] && [ -f "$(PLATFORM_DIR)/$(NODE_ADDON)" ]; then \
+		echo "✓ $(LIB_NAME) — $$(ls -lh $(PLATFORM_DIR)/$(LIB_NAME) | awk '{print $$5}')"; \
+		echo "✓ $(NODE_ADDON) — $$(ls -lh $(PLATFORM_DIR)/$(NODE_ADDON) | awk '{print $$5}')"; \
+		echo ""; \
+		echo "╔══════════════════════════════════════════════════════════════╗"; \
+		echo "║  ✓ Prebuilt binaries ready — no compilation needed!          ║"; \
+		echo "╚══════════════════════════════════════════════════════════════╝"; \
+	else \
+		echo "✗ Prebuilt binaries not found for $(PLATFORM)"; \
+		exit 1; \
+	fi
+endif
+
 # Default install - auto-detect best method
+# Order: prebuilt-shipped → hybrid → source
 .PHONY: install-auto
 install-auto:
 	$(Q)echo ""
@@ -799,7 +865,9 @@ install-auto:
 	$(Q)echo "║  Auto-detecting best installation method...                  ║"
 	$(Q)echo "╚══════════════════════════════════════════════════════════════╝"
 	$(Q)echo ""
-	@$(MAKE) install-hybrid || $(MAKE) install-source
+	@$(MAKE) install-prebuilt-shipped 2>/dev/null \
+		|| $(MAKE) install-hybrid 2>/dev/null \
+		|| $(MAKE) install-source
 
 # ------------------------------------------------------------------------------
 # Verification
@@ -887,11 +955,18 @@ help:
 	@echo "  INSTALLATION OPTIONS"
 	@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 	@echo ""
-	@echo "  make install            Auto-detect best method (hybrid → source)"
+	@echo "  make install            Auto-detect (prebuilt → hybrid → source)"
 	@echo "  make install-source     Build everything from source (needs Go)"
 	@echo "  make install-hybrid     Download lib, build addon (needs compiler)"
 	@echo "  make install-prebuilt   Download everything (Node.js only)"
 	@echo ""
+	@echo "  Via npm (one command):"
+	@echo "    npm install <pkg>                           # auto-detect"
+	@echo "    UPLINK_INSTALL=prebuilt npm install <pkg>   # use shipped binaries"
+	@echo "    UPLINK_INSTALL=hybrid  npm install <pkg>    # compile addon only"
+	@echo "    UPLINK_INSTALL=source  npm install <pkg>    # full source build"
+	@echo "    UPLINK_INSTALL=skip    npm install <pkg>    # skip native build"
+	@echo ""
 	@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 	@echo "  BUILD TARGETS"
 	@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -931,6 +1006,7 @@ help:
 	@echo "  VARIABLES"
 	@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 	@echo ""
+	@echo "  UPLINK_INSTALL     Install method: auto|prebuilt|hybrid|source|skip"
 	@echo "  UPLINK_C_DIR       Path to uplink-c source (default: ../uplink-c)"
 	@echo "  UPLINK_C_VERSION   Version to download/clone (default: $(UPLINK_C_VERSION))"
 	@echo "  GITHUB_OWNER       GitHub owner for prebuilt downloads (default: $(GITHUB_OWNER))"
@@ -943,8 +1019,9 @@ help:
 	@echo "  EXAMPLES"
 	@echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 	@echo ""
-	@echo "  make install-prebuilt                  # Fastest, no compiler"
-	@echo "  make install-hybrid VERBOSE=1          # With detailed output"
-	@echo "  make install-source UPLINK_C_DIR=~/uplink-c"
+	@echo "  npm install @shivam995364/uplink-nodejs-test          # auto"
+	@echo "  UPLINK_INSTALL=prebuilt npm install @shivam995364/uplink-nodejs-test"
+	@echo "  UPLINK_INSTALL=source UPLINK_C_DIR=~/uplink-c npm install ..."
+	@echo "  make install-hybrid VERBOSE=1          # Direct Make"
 	@echo "  make download-lib UPLINK_C_VERSION=v1.13.0"
 	@echo ""

package/binding.gyp

@@ -64,7 +64,8 @@
           "libraries": [
             "-L<(module_root_dir)/native/prebuilds/darwin-<(target_arch)",
             "-luplink",
-            "-Wl,-rpath,@loader_path/../../native/prebuilds/darwin-<(target_arch)"
+            "-Wl,-rpath,@loader_path/../../native/prebuilds/darwin-<(target_arch)",
+            "-Wl,-rpath,@loader_path"
           ],
           "postbuilds": [
             {
@@ -83,7 +84,8 @@
           "libraries": [
             "-L<(module_root_dir)/native/prebuilds/linux-<(target_arch)",
             "-luplink",
-            "-Wl,-rpath,$ORIGIN/../../native/prebuilds/linux-<(target_arch)"
+            "-Wl,-rpath,$ORIGIN/../../native/prebuilds/linux-<(target_arch)",
+            "-Wl,-rpath,$ORIGIN"
           ]
         }],
         ["OS=='win'", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivam995364/uplink-nodejs-test",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.6",
   "description": "Node.js bindings for Storj's uplink-c library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,10 +45,10 @@
     "security:licenses": "npx license-checker --production --onlyAllow 'MIT;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;0BSD'",
     "security:all": "npm run security && npm run security:c && npm run security:secrets && npm run security:licenses",
     "prepublishOnly": "npm run lint && npm run build && npm run test:unit",
-    "postinstall": "make install-auto 2>/dev/null || node scripts/postinstall-fallback.js",
-    "install:source": "make install-source",
-    "install:hybrid": "make install-hybrid",
-    "install:prebuilt": "make install-prebuilt",
+    "postinstall": "make install 2>/dev/null || node scripts/postinstall-fallback.js",
+    "install:source": "UPLINK_INSTALL=source make install",
+    "install:hybrid": "UPLINK_INSTALL=hybrid make install",
+    "install:prebuilt": "UPLINK_INSTALL=prebuilt make install",
     "prepare": "husky"
   },
   "repository": {
@@ -75,6 +75,7 @@
     "native/src",
     "native/prebuilds",
     "scripts/postinstall-fallback.js",
+    "scripts/gen-def.js",
     "Makefile",
     "binding.gyp"
   ],

package/scripts/gen-def.js

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+/**
+ * @file scripts/gen-def.js
+ * @brief Generate a Windows .def file from the uplink-c header.
+ *
+ * Reads native/include/uplink.h, extracts all "extern ... function_name("
+ * declarations, and writes a .def file that can be used with dlltool or
+ * lib.exe to create an import library (.lib) for MSVC linking.
+ *
+ * Usage: node scripts/gen-def.js <header-path> <output-def-path>
+ */
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const headerPath = process.argv[2] || path.join(__dirname, '..', 'native', 'include', 'uplink.h');
+const defPath = process.argv[3] || path.join(__dirname, '..', 'native', 'prebuilds', 'win32-x64', 'uplink.def');
+
+if (!fs.existsSync(headerPath)) {
+  console.error(`Header not found: ${headerPath}`);
+  process.exit(1);
+}
+
+const header = fs.readFileSync(headerPath, 'utf8');
+
+// Match "extern [__declspec(dllexport)] <return-type> <function_name>(" patterns from CGO header.
+// CGO exports look like: extern __declspec(dllexport) TYPE uplink_something(...)
+// or plain: extern TYPE uplink_something(...)
+// Use [ \t] instead of \s to prevent matching across newlines (e.g. from "extern "C" {").
+const funcRegex = /^extern[ \t]+(?:__declspec\(dllexport\)[ \t]+)?(?:\S+[ \t]+)*?(\w+)[ \t]*\(/gm;
+const symbols = new Set();
+let match;
+while ((match = funcRegex.exec(header)) !== null) {
+  const name = match[1];
+  // Skip CGO internal helpers
+  if (name.startsWith('_')) continue;
+  symbols.add(name);
+}
+
+if (symbols.size === 0) {
+  console.error('No exported symbols found in header');
+  process.exit(1);
+}
+
+const sorted = Array.from(symbols).sort();
+const defContent = 'LIBRARY libuplink.dll\nEXPORTS\n' + sorted.map(s => `    ${s}`).join('\n') + '\n';
+
+// Ensure output directory exists
+const outDir = path.dirname(defPath);
+if (!fs.existsSync(outDir)) {
+  fs.mkdirSync(outDir, { recursive: true });
+}
+
+fs.writeFileSync(defPath, defContent);
+console.log(`Generated ${defPath} with ${sorted.length} exports`);