Merge branch 'master' into issue-814

.github/workflows/build.yml

@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     name: Docker Image
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: imgtagger
         run: |
           imgtags=$(echo "${{ github.ref }}" | sed 's/refs\/tags\//latest,/; s/refs\/heads\///')
           echo "::set-output name=imgtags::$imgtags"
       - name: Build and Push to DockerHub
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/codeql.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/comment-run.yml

@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Code (Deep)
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up IPFS and Rub Daemon
-      uses: ibnesayeed/setup-ipfs@master
+      uses: oduwsdl/setup-ipfs@main
       with:
         run_daemon: true
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
     - name: Install Test Dependencies
       run: pip install -r test-requirements.txt
     - name: Install IPWB from Source

.github/workflows/dist.yml

@@ -10,9 +10,9 @@ jobs:
     name: Build and Publish Package
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Upgrade setuptools and wheel

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Py and JS
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Lint JavaScript
         run: |
           npm install standard

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Extract Repo Attributes

.github/workflows/test.yml

@@ -20,20 +20,20 @@ jobs:
           - "3.11"
           - "3.12"
         ipfs:
-          - "0.25"
           - "0.26"
           - "0.27"
           - "0.28"
+          - "0.29"
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} Py-${{ matrix.python }} IPFS-${{ matrix.ipfs }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Set up IPFS ${{ matrix.ipfs }}
-        uses: ibnesayeed/setup-ipfs@master
+        uses: oduwsdl/setup-ipfs@main
         with:
           ipfs_version: ${{ matrix.ipfs }}
           run_daemon: true

Dockerfile

@@ -21,9 +21,10 @@ RUN        mkdir -p /data/{warc,cdxj,ipfs}
 
 # Download and install IPFS
 ENV        IPFS_PATH=/data/ipfs
-ARG        IPFS_VERSION=v0.28.0
+ARG        IPFS_VERSION=v0.29.0
+ARG        BUILDARCH
 RUN        cd /tmp \
-           && wget -q https://dist.ipfs.io/kubo/${IPFS_VERSION}/kubo_${IPFS_VERSION}_linux-amd64.tar.gz \
+           && wget -q https://dist.ipfs.io/kubo/${IPFS_VERSION}/kubo_${IPFS_VERSION}_linux-$BUILDARCH.tar.gz \
            && tar xvfz kubo*.tar.gz \
            && mv kubo/ipfs /usr/local/bin/ipfs \
            && rm -rf kubo* \

ipwb/__init__.py

@@ -1 +1 @@
-__version__ = '0.2023.08.16.1719'
+__version__ = '0.2024.05.24.1842'

ipwb/assets/webui.js

@@ -234,7 +234,7 @@ function injectIPWBJS () { // eslint-disable-line no-unused-vars
 function getServiceWorkerVersion () {
   return window.fetch(document.location.href)
     .then(function (resp) {
-      return Promise.resolve(resp.headers.get('Server').split('/')[1])
+      return Promise.resolve(resp.headers.get('Server').split('/').at(-1))
     })
 }
 

requirements.txt

@@ -1,6 +1,6 @@
 warcio>=1.5.3
 ipfshttpclient>=0.8.0a
-Flask==2.3.2
+Flask>=3.0
 pycryptodome>=3.4.11
 requests>=2.19.1
 beautifulsoup4>=4.6.3

setup.py

@@ -26,7 +26,7 @@
     install_requires=[
         'warcio>=1.5.3',
         'ipfshttpclient>=0.8.0a',
-        'Flask==2.3.2',
+        'Flask>=3.0',
         'pycryptodome>=3.4.11',
         'requests>=2.19.1',
         'beautifulsoup4>=4.6.3',