address pr comments and test failure

Author: sam-mfb

.github/workflows/npm-publish.yml

@@ -9,37 +9,67 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
+      
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      
+      - name: Setup pnpm cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+      
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install
 
       - name: Build
-        run: npm run build
+        run: pnpm run build
 
       - name: Run tests
-        run: npm test -- --no-watch
+        run: pnpm test -- --no-watch
 
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
+      
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install
 
       - name: Build
-        run: npm run build
+        run: pnpm run build
 
       - name: Publish to NPM
-        run: npm publish
+        run: pnpm publish --no-git-checks
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/unit-tests.yml

@@ -16,16 +16,35 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '18.x'
-          cache: 'npm'
+      
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+          run_install: false
+      
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      
+      - name: Setup pnpm cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install
 
       - name: Run linting
-        run: npm run lint
+        run: pnpm run lint
 
       - name: Run unit tests
-        run: npm test -- --no-watch
+        run: pnpm test -- --no-watch
 
       - name: Build
-        run: npm run build
+        run: pnpm run build

prepend-shebang.js

@@ -1,11 +1,15 @@
 const fs = require('fs');
 const path = require('path');
 
-const shebang = '#!/usr/bin/env node\n';
-const files = ['o2f-server.js', 'o2f-client.js'];
+const nodeShebang = '#!/usr/bin/env node\n';
+const shFiles = '#!/usr/bin/env sh\n';
+
+// Node.js files
+const jsFiles = ['o2f-server.js', 'o2f-client.js'];
 const distPath = path.join(__dirname, 'dist');
 
-files.forEach(file => {
+// Handle JS files
+jsFiles.forEach(file => {
   const filePath = path.join(distPath, file);
 
   if (fs.existsSync(filePath)) {
@@ -14,9 +18,9 @@ files.forEach(file => {
 
     // Check if shebang is already there
     if (!content.startsWith('#!')) {
-      console.log(`Adding shebang to ${file}`);
+      console.log(`Adding node shebang to ${file}`);
       // Write the file with shebang prepended
-      fs.writeFileSync(filePath, shebang + content);
+      fs.writeFileSync(filePath, nodeShebang + content);
       // Make the file executable
       fs.chmodSync(filePath, '755');
     } else {
@@ -25,4 +29,24 @@ files.forEach(file => {
   } else {
     console.error(`File not found: ${filePath}`);
   }
-});
+});
+
+// Handle browser script
+const browserFile = path.join(__dirname, 'browser-global.sh');
+if (fs.existsSync(browserFile)) {
+  // Read the file content
+  const content = fs.readFileSync(browserFile, 'utf8');
+  
+  // Check if shebang is already there and set executable flag regardless
+  fs.chmodSync(browserFile, '755');
+  
+  if (!content.startsWith('#!')) {
+    console.log(`Adding sh shebang to browser-global.sh`);
+    // Write the file with shebang prepended
+    fs.writeFileSync(browserFile, shFiles + content);
+  } else {
+    console.log(`Shebang already exists in browser-global.sh`);
+  }
+} else {
+  console.error(`File not found: ${browserFile}`);
+}