@ayesh/geo-ip-database 1.0.20210117 → 1.1.20230811

package/.gitattributes

@@ -1,11 +1,11 @@
-# https://php.watch/articles/composer-gitattributes
-
-# Exclude build/test files from archive
-/.github          export-ignore
-/.gitattributes   export-ignore
-/.gitignore       export-ignore
-/.npmignore       export-ignore
-
-# Configure diff output for .php and .phar files.
-*.php diff=php
-*.phar -diff
+# https://php.watch/articles/composer-gitattributes
+
+# Exclude build/test files from archive
+/.github          export-ignore
+/.gitattributes   export-ignore
+/.gitignore       export-ignore
+/.npmignore       export-ignore
+
+# Configure diff output for .php and .phar files.
+*.php diff=php
+*.phar -diff

package/.github/workflows/ci.yml

@@ -1,49 +1,36 @@
 name: Update GeoIP Database
-on: [push]
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '5 4 */3 * *'
 
 jobs:
   build:
 
     strategy:
       matrix:
-        php-versions: ['8.0']
-    runs-on: ubuntu-20.04
+        php-versions: ['8.2']
+    runs-on: ubuntu-latest
 
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
 
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
 
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          # Use composer.json for key, if composer.lock is not committed.
-          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-
       - name: Install dependencies
         run: |
+          git config --global --add safe.directory /github/workspace
           rm -rf vendor/bin
           composer install --no-progress --prefer-dist
 
-
       - name: Download and setup database
         run: |
           mkdir input
@@ -53,31 +40,36 @@ jobs:
           mv input/*/*.csv input/ -f
           ls input
 
-
       - name: Process database
         run: |
+          git config --global --add safe.directory '*'
           php vendor/ayesh/geo-ip-tree-builder/run.php input/GeoLite2-Country-Blocks-IPv4.csv input/GeoLite2-Country-Locations-en.csv data
           git status
 
-
       - name: Get current date
         id: date
         run: |
           echo "::set-output name=date::$(date +'%Y%m%d')"
           echo "Update database ${{steps.date.outputs.date}}"
-
+          
+      - name: Update composer and npm package versions
+        run: |
+          npm --no-git-tag-version version "v1.1.${{steps.date.outputs.date}}"
 
       - name: Commit and tag if changed
         uses: stefanzweifel/git-auto-commit-action@v4
-        id: commit
         with:
           commit_message: "Update database ${{steps.date.outputs.date}}"
-          tagging_message: "v1.0.${{steps.date.outputs.date}}"
+          tagging_message: "v1.1.${{steps.date.outputs.date}}"
           branch: main
 
-      - name: Publish NPM version
-        if: steps.commit.outputs.changes_detected == 'true'
-        uses: JS-DevTools/npm-publish@v1
+      - uses: actions/setup-node@v3
         with:
-          token: ${{ secrets.NPM_TOKEN }}
-          tag: 1.0.${{steps.date.outputs.date}}
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: "Publish npm releases"
+        run: |
+          npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/README.md

@@ -1,3 +1,35 @@
-## Source
-
-This product includes GeoLite2 data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com).
+# Geo IP Database
+
+This is an automated repository that downloads and processes GeoLite database from [Maxmind GeoLite database](#source), and processes it to be consumed by [`ayesh/geo-ip`](https://github.com/Ayesh/Geo-IP) composer package. 
+
+
+This repository only contains the JSON files that other packages (mainly [`ayesh/geo-ip`](https://github.com/Ayesh/Geo-IP)) consumes. 
+
+This repository is automatically updated on every Monday, and if there are new changes, a new minor version will be tagged and published automatically. 
+
+See [`Ayesh/Geo-IP-Tree-Builder`](https://github.com/Ayesh/Geo-IP-Tree-Builder) for the actual parser.
+
+## Usage
+
+[`ayesh/geo-ip`](https://github.com/Ayesh/Geo-IP) package is the main target use case, and that package `require`s this repository. If you use `ayesh/geo-ip` package, no further action is necessary.
+
+### Composer
+
+```bash
+composer require ayesh/geo-ip-database ^1.0.0
+```
+
+### NPM/Yarn
+
+```bash
+npm i @ayesh/geo-ip-database
+```
+
+## Updates
+
+This repository will be updated and tagged automatically. Make sure to require the `ayesh/geo-ip-database` without pinning a specific version (e.g `^1.0.0`), and running `npm up` or `composer update` should automatically use the newest database version.
+
+
+## Source
+
+This product includes GeoLite2 data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com).

package/composer.json

@@ -0,0 +1,15 @@
+{
+    "name": "ayesh/geo-ip-database",
+    "description": "Weekly updated database of IP CIDR to Country codes, indexed by the first 1/4th of the IP address",
+    "type": "library",
+    "license": "CC-BY-NC-SA-4.0",
+    "authors": [
+        {
+            "name": "Ayesh Karunaratne",
+            "email": "ayesh@aye.sh"
+        }
+    ],
+    "require-dev": {
+        "ayesh/geo-ip-tree-builder": "^1.1.0"
+    }
+}

package/data/1.json

@@ -1,58 +1,39 @@
 {
     "0": "AU",
     "256": "CN",
-    "512": "CN",
     "1024": "AU",
     "2048": "CN",
     "4096": "JP",
     "8192": "CN",
+    "16384": "JP",
     "32768": "TH",
     "65536": "CN",
-    "65792": "AU",
+    "65792": "US",
+    "65793": "",
+    "65794": "US",
+    "65796": "AU",
     "66048": "CN",
-    "66560": "CN",
-    "67584": "CN",
-    "69632": "CN",
-    "73728": "CN",
     "81920": "JP",
     "98304": "TH",
     "131072": "CN",
-    "131584": "CN",
     "131840": "AU",
     "132096": "CN",
-    "133120": "CN",
     "133376": "RU",
     "133632": "CN",
-    "134144": "CN",
-    "135168": "CN",
-    "139264": "CN",
-    "147456": "CN",
     "163840": "TH",
     "196608": "CN",
     "262144": "AU",
     "262400": "CN",
-    "262656": "CN",
-    "263168": "CN",
-    "264192": "CN",
     "264448": "RU",
     "264704": "CN",
-    "265216": "CN",
-    "266240": "CN",
-    "270336": "CN",
-    "278528": "CN",
     "294912": "TH",
     "327680": "JP",
     "393216": "IN",
     "524288": "CN",
     "589824": "MY",
     "655360": "CN",
-    "657408": "CN",
     "657920": "AU",
     "658176": "CN",
-    "658432": "CN",
-    "659456": "CN",
-    "663552": "CN",
-    "671744": "CN",
     "688128": "TH",
     "720896": "KR",
     "786432": "CN",
@@ -63,13 +44,10 @@
     "1572864": "CN",
     "2097152": "MY",
     "2129920": "SG",
-    "2146304": "SG",
     "2146816": "TW",
     "2147072": "SG",
-    "2147328": "SG",
     "2147584": "TW",
     "2147840": "SG",
-    "2148352": "SG",
     "2148864": "TW",
     "2148992": "SG",
     "2149120": "TW",
@@ -78,72 +56,23 @@
     "2149504": "SG",
     "2149632": "HK",
     "2149888": "SG",
-    "2150400": "SG",
-    "2152448": "SG",
     "2153472": "KR",
     "2153728": "SG",
-    "2153984": "SG",
-    "2154496": "SG",
-    "2155008": "SG",
-    "2155040": "SG",
-    "2155056": "SG",
-    "2155064": "SG",
     "2155065": "JP",
     "2155066": "SG",
-    "2155068": "SG",
-    "2155072": "SG",
-    "2155136": "SG",
-    "2155264": "SG",
-    "2155520": "SG",
-    "2156544": "SG",
-    "2158592": "SG",
-    "2160640": "SG",
     "2161664": "KH",
     "2161920": "SG",
-    "2162176": "SG",
     "2162688": "JP",
     "2228224": "CN",
     "2228225": "TW",
-    "2228226": "TW",
-    "2228228": "TW",
-    "2228232": "TW",
-    "2228240": "TW",
-    "2228256": "TW",
-    "2228288": "TW",
-    "2228352": "TW",
-    "2228480": "TW",
-    "2228736": "TW",
-    "2229248": "TW",
-    "2230272": "TW",
-    "2232320": "TW",
-    "2236416": "TW",
-    "2244608": "TW",
-    "2260992": "TW",
-    "2293760": "TW",
     "2359296": "HK",
     "2424832": "PH",
     "2490368": "IN",
     "2621440": "AU",
-    "2883584": "AU",
     "2949120": "CN",
     "3014656": "TH",
-    "3022848": "TH",
-    "3026944": "TH",
-    "3028992": "TH",
-    "3030016": "TH",
     "3030017": "CN",
     "3030018": "TH",
-    "3030020": "TH",
-    "3030024": "TH",
-    "3030032": "TH",
-    "3030048": "TH",
-    "3030080": "TH",
-    "3030144": "TH",
-    "3030272": "TH",
-    "3030528": "TH",
-    "3031040": "TH",
-    "3047424": "TH",
-    "3080192": "TH",
     "3145728": "CN",
     "3407872": "VN",
     "3670016": "CN",
@@ -155,47 +84,35 @@
     "6291456": "KR",
     "7340032": "JP",
     "7602176": "CN",
+    "7741440": "NL",
+    "7741696": "CN",
     "7864320": "AU",
-    "8388608": "AU",
     "10485760": "TW",
-    "11010048": "TW",
-    "11272192": "TW",
-    "11337728": "TW",
-    "11354112": "TW",
-    "11358208": "TW",
-    "11360256": "TW",
-    "11361280": "TW",
-    "11361792": "TW",
-    "11361856": "TW",
-    "11361872": "TW",
-    "11361880": "TW",
     "11361884": "RU",
     "11361888": "TW",
-    "11361920": "TW",
-    "11362048": "TW",
-    "11362304": "TW",
-    "11370496": "TW",
-    "11403264": "TW",
     "11534336": "KR",
     "11665408": "AU",
-    "11698176": "AU",
-    "11714560": "AU",
-    "11718656": "HK",
+    "11673600": "BR",
+    "11677696": "AR",
+    "11681792": "AU",
+    "11694080": "PS",
+    "11702272": "AU",
+    "11718656": "PS",
     "11722752": "ES",
     "11730944": "AU",
-    "11747328": "AU",
+    "11741184": "PS",
+    "11743232": "AU",
+    "11749376": "PS",
+    "11751424": "AU",
+    "11753472": "PS",
     "11755520": "AU",
-    "11759616": "AU",
+    "11759616": "FR",
     "11763712": "TH",
     "11796480": "CN",
-    "12058624": "CN",
     "12189696": "IN",
     "12320768": "CN",
-    "12582912": "CN",
     "13107200": "TW",
     "13172736": "KR",
     "13238272": "CN",
-    "13369344": "CN",
-    "13631488": "KR",
-    "14680064": "KR"
-}
+    "13631488": "KR"
+}

package/data/100.json

@@ -1,22 +1,10 @@
 {
     "0": "US",
-    "2097152": "US",
-    "2621440": "US",
-    "2752512": "US",
-    "2756608": "US",
     "2757632": "CA",
     "2758656": "US",
-    "2760704": "US",
-    "2768896": "US",
-    "2785280": "US",
-    "2801664": "US",
-    "2809856": "US",
     "2813952": "CA",
     "2818048": "US",
     "2834432": "RU",
     "2842624": "CA",
-    "2850816": "US",
-    "2883584": "US",
-    "3145728": "US",
-    "8388608": "US"
+    "2850816": "US"
 }