FIxing build

Author: Fabiana Severin

.github/workflows/build-and-release.yml

@@ -54,33 +54,30 @@ jobs:
         echo "Building for architecture: $(arch)"
         CURRENT_ARCH=$(arch)
         
-        # Build native dependencies and JavaScript
+        # Build native dependencies and JavaScript (this creates dist/node14 and dist/node16)
         BUILD=1 npm install
         npm run build
         
-        # Verify native binary was built
-        if [ ! -f "build/Release/rapid-client.node" ]; then
-          echo "Error: Native binary not found at build/Release/rapid-client.node"
+        # Verify required files were created
+        if [ ! -f "dist/rapid-client.node" ] || [ ! -f "dist/index.mjs" ] || [ ! -f "dist/UserFunction.js" ]; then
+          echo "Error: Required files not found in dist directory"
           exit 1
         fi
         
-        # Copy native binary to dist directory
-        mkdir -p dist
-        cp build/Release/rapid-client.node dist/
-        
-        # Create architecture-specific package name
+        # Copy architecture-specific package.json to dist
         node -e "
           const pkg = require('./package.json');
           pkg.name = 'aws-lambda-ric-' + process.env.CURRENT_ARCH;
-          require('fs').writeFileSync('./package.json', JSON.stringify(pkg, null, 2));
+          require('fs').writeFileSync('./dist/package.json', JSON.stringify(pkg, null, 2));
         " CURRENT_ARCH=$CURRENT_ARCH
         
-        npm pack
+        # Create tarball from dist directory
+        cd dist && tar -czf ../aws-lambda-ric-$CURRENT_ARCH-${{ needs.get-version.outputs.version }}.tgz .
     
     - name: Generate checksums
       run: |
-        PACKAGE_FILE=$(ls aws-lambda-ric-*.tgz)
         CURRENT_ARCH=$(arch)
+        PACKAGE_FILE="aws-lambda-ric-$CURRENT_ARCH-${{ needs.get-version.outputs.version }}.tgz"
         sha256sum $PACKAGE_FILE > checksums-$CURRENT_ARCH.sha256
         sha512sum $PACKAGE_FILE > checksums-$CURRENT_ARCH.sha512
         echo "Package: $PACKAGE_FILE ($CURRENT_ARCH) with version: ${{ needs.get-version.outputs.version }}" > checksums-$CURRENT_ARCH.txt
@@ -90,7 +87,7 @@ jobs:
       with:
         name: package-${{ matrix.arch }}-${{ needs.get-version.outputs.version }}
         path: |
-          aws-lambda-ric-*.tgz
+          aws-lambda-ric-${{ matrix.arch }}-*.tgz
           checksums-*.*
         retention-days: 30
 
@@ -164,7 +161,7 @@ jobs:
         
         # Publish architecture-specific packages
         for arch in x86_64 aarch64; do
-          PACKAGE_FILE=$(ls ./artifacts/$arch/aws-lambda-ric-*.tgz)
+          PACKAGE_FILE=$(ls ./artifacts/$arch/aws-lambda-ric-$arch-*.tgz)
           echo "Publishing $PACKAGE_FILE for architecture $arch"
           npm publish $PACKAGE_FILE $TAG_FLAG --access=public
         done
@@ -180,6 +177,6 @@ jobs:
       uses: softprops/action-gh-release@v2
       with:
         files: |
-          ./artifacts/*/aws-lambda-ric-*.tgz
+          ./artifacts/*/aws-lambda-ric-*-*.tgz
           combined-checksums.*
         prerelease: ${{ steps.version.outputs.is_rc }}

.npmignore

@@ -4,6 +4,8 @@ build
 src/*
 # Rapid-client.c to be used with node-gyp
 !src/rapid-client.cc
+# Include built native binary
+!dist/rapid-client.node
 test
 
 # Logs

src/build.js

@@ -28,22 +28,29 @@ const buildOneSet = (target) => {
     target,
   });
 
-  // Keep backward compatibility for Node14
-  if (process.version.startsWith('v14')) {
-    build({
-      ...shared,
-      format: 'cjs',
-      entryPoints: ['UserFunction.js'],
-      banner: {
-        js: '(function (){',
-      },
-      footer: {
-        js: '})();',
-      },
-      outfile: `../dist/UserFunction.js`,
-      target,
-    });
-  }
+  // Always build UserFunction.js
+  build({
+    ...shared,
+    format: 'cjs',
+    entryPoints: ['UserFunction.js'],
+    banner: {
+      js: '(function (){',
+    },
+    footer: {
+      js: '})();',
+    },
+    outfile: `../dist/UserFunction.js`,
+    target,
+  });
+
+  // Copy rapid-client
+  fs.mkdirSync(`../dist`, {
+    recursive: true,
+  });
+  fs.copyFileSync(
+    '../build/Release/rapid-client.node',
+    `../dist/rapid-client.node`,
+  );
 };
 
-buildOneSet('node14.21.3');
+buildOneSet('node16.20.2');