@ayesh/geo-ip-database 1.0.20210118 → 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,56 +1,75 @@
 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
-          wget -O db.zip https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=${{ secrets.MAXMIND_LICENSE_KEY }}&suffix=zip
+          wget -O db.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=${{ secrets.MAXMIND_LICENSE_KEY }}&suffix=zip"
           unzip db.zip -d input
           rm db.zip
           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
+        with:
+          commit_message: "Update database ${{steps.date.outputs.date}}"
+          tagging_message: "v1.1.${{steps.date.outputs.date}}"
+          branch: main
+
+      - uses: actions/setup-node@v3
+        with:
+          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

@@ -0,0 +1,118 @@
+{
+    "0": "AU",
+    "256": "CN",
+    "1024": "AU",
+    "2048": "CN",
+    "4096": "JP",
+    "8192": "CN",
+    "16384": "JP",
+    "32768": "TH",
+    "65536": "CN",
+    "65792": "US",
+    "65793": "",
+    "65794": "US",
+    "65796": "AU",
+    "66048": "CN",
+    "81920": "JP",
+    "98304": "TH",
+    "131072": "CN",
+    "131840": "AU",
+    "132096": "CN",
+    "133376": "RU",
+    "133632": "CN",
+    "163840": "TH",
+    "196608": "CN",
+    "262144": "AU",
+    "262400": "CN",
+    "264448": "RU",
+    "264704": "CN",
+    "294912": "TH",
+    "327680": "JP",
+    "393216": "IN",
+    "524288": "CN",
+    "589824": "MY",
+    "655360": "CN",
+    "657920": "AU",
+    "658176": "CN",
+    "688128": "TH",
+    "720896": "KR",
+    "786432": "CN",
+    "1048576": "KR",
+    "1310720": "TH",
+    "1376256": "JP",
+    "1441792": "IN",
+    "1572864": "CN",
+    "2097152": "MY",
+    "2129920": "SG",
+    "2146816": "TW",
+    "2147072": "SG",
+    "2147584": "TW",
+    "2147840": "SG",
+    "2148864": "TW",
+    "2148992": "SG",
+    "2149120": "TW",
+    "2149248": "SG",
+    "2149376": "TW",
+    "2149504": "SG",
+    "2149632": "HK",
+    "2149888": "SG",
+    "2153472": "KR",
+    "2153728": "SG",
+    "2155065": "JP",
+    "2155066": "SG",
+    "2161664": "KH",
+    "2161920": "SG",
+    "2162688": "JP",
+    "2228224": "CN",
+    "2228225": "TW",
+    "2359296": "HK",
+    "2424832": "PH",
+    "2490368": "IN",
+    "2621440": "AU",
+    "2949120": "CN",
+    "3014656": "TH",
+    "3030017": "CN",
+    "3030018": "TH",
+    "3145728": "CN",
+    "3407872": "VN",
+    "3670016": "CN",
+    "4194304": "HK",
+    "4325376": "JP",
+    "4456448": "CN",
+    "4718592": "JP",
+    "5242880": "CN",
+    "6291456": "KR",
+    "7340032": "JP",
+    "7602176": "CN",
+    "7741440": "NL",
+    "7741696": "CN",
+    "7864320": "AU",
+    "10485760": "TW",
+    "11361884": "RU",
+    "11361888": "TW",
+    "11534336": "KR",
+    "11665408": "AU",
+    "11673600": "BR",
+    "11677696": "AR",
+    "11681792": "AU",
+    "11694080": "PS",
+    "11702272": "AU",
+    "11718656": "PS",
+    "11722752": "ES",
+    "11730944": "AU",
+    "11741184": "PS",
+    "11743232": "AU",
+    "11749376": "PS",
+    "11751424": "AU",
+    "11753472": "PS",
+    "11755520": "AU",
+    "11759616": "FR",
+    "11763712": "TH",
+    "11796480": "CN",
+    "12189696": "IN",
+    "12320768": "CN",
+    "13107200": "TW",
+    "13172736": "KR",
+    "13238272": "CN",
+    "13631488": "KR"
+}

package/data/100.json

@@ -0,0 +1,10 @@
+{
+    "0": "US",
+    "2757632": "CA",
+    "2758656": "US",
+    "2813952": "CA",
+    "2818048": "US",
+    "2834432": "RU",
+    "2842624": "CA",
+    "2850816": "US"
+}

package/data/101.json

@@ -0,0 +1,229 @@
+{
+    "0": "CN",
+    "1024": "ID",
+    "2048": "JP",
+    "8192": "IN",
+    "16384": "AU",
+    "32768": "TW",
+    "65536": "CN",
+    "66560": "HK",
+    "67584": "KR",
+    "81920": "JP",
+    "131072": "IN",
+    "163840": "JP",
+    "172032": "BD",
+    "174080": "AU",
+    "175104": "CN",
+    "176128": "LK",
+    "180224": "AU",
+    "196608": "TW",
+    "262144": "CN",
+    "524288": "TW",
+    "1048576": "CN",
+    "2097152": "HK",
+    "2103822": "SG",
+    "2103823": "HK",
+    "2107994": "",
+    "2107995": "HK",
+    "2117632": "IN",
+    "2121216": "JP",
+    "2123776": "SG",
+    "2142208": "HK",
+    "2154496": "TH",
+    "2155520": "IN",
+    "2158080": "SG",
+    "2162688": "IN",
+    "2163712": "ID",
+    "2164480": "SG",
+    "2164736": "BR",
+    "2165248": "DE",
+    "2165760": "IN",
+    "2167040": "JP",
+    "2167296": "PH",
+    "2167808": "US",
+    "2168320": "BR",
+    "2168576": "SG",
+    "2168832": "BR",
+    "2169088": "SG",
+    "2170112": "NL",
+    "2170368": "VN",
+    "2170624": "SG",
+    "2170880": "HK",
+    "2173440": "SG",
+    "2176000": "JP",
+    "2177024": "KR",
+    "2177280": "SG",
+    "2178048": "IN",
+    "2179072": "KR",
+    "2179328": "SG",
+    "2179584": "KR",
+    "2185216": "SG",
+    "2185728": "KR",
+    "2186240": "SG",
+    "2188032": "KR",
+    "2188288": "SG",
+    "2192384": "HK",
+    "2195456": "CN",
+    "2383872": "GB",
+    "2384384": "US",
+    "2384896": "PH",
+    "2385408": "VN",
+    "2385920": "JP",
+    "2386432": "HK",
+    "2388480": "KR",
+    "2388736": "US",
+    "2388992": "HK",
+    "2392064": "CN",
+    "2883584": "CL",
+    "2887680": "SG",
+    "2891776": "TR",
+    "2895872": "SG",
+    "2899968": "HK",
+    "2904064": "CN",
+    "2912256": "SG",
+    "2936832": "NL",
+    "2937856": "KR",
+    "2938880": "VN",
+    "2939904": "TR",
+    "2940928": "SG",
+    "2948096": "TR",
+    "2948352": "SG",
+    "2949120": "US",
+    "3014656": "SG",
+    "3096576": "HK",
+    "3100672": "SG",
+    "3145728": "CN",
+    "3244032": "US",
+    "3260416": "CN",
+    "3276800": "ID",
+    "3277824": "JP",
+    "3278848": "CN",
+    "3280896": "ID",
+    "3284992": "JP",
+    "3291136": "CN",
+    "3292160": "JP",
+    "3293184": "PK",
+    "3309568": "JP",
+    "3342336": "TH",
+    "3407872": "CN",
+    "3473408": "VN",
+    "3489792": "KR",
+    "3497984": "JP",
+    "3506176": "IN",
+    "3514368": "JP",
+    "3522560": "NZ",
+    "3530752": "PK",
+    "3538944": "CN",
+    "3604480": "KR",
+    "3637248": "JP",
+    "3661824": "CN",
+    "3663872": "JP",
+    "3670016": "IT",
+    "3718133": "IN",
+    "3718134": "IT",
+    "3884739": "IN",
+    "3884740": "IT",
+    "4194304": "CN",
+    "5112832": "JP",
+    "5113856": "LA",
+    "5115904": "MY",
+    "5120000": "CN",
+    "5128192": "SG",
+    "5144576": "HK",
+    "5177344": "KR",
+    "5215232": "AU",
+    "5216000": "HK",
+    "5216256": "KR",
+    "5242880": "CN",
+    "6294528": "VN",
+    "6295552": "CN",
+    "6299648": "JP",
+    "6307840": "VN",
+    "6324224": "CN",
+    "6356992": "JP",
+    "6365184": "AU",
+    "6373376": "SG",
+    "6389760": "JP",
+    "6422528": "NZ",
+    "6488064": "VN",
+    "6504448": "MY",
+    "6512640": "CN",
+    "6520832": "GU",
+    "6545408": "MP",
+    "6553600": "NZ",
+    "6594560": "SG",
+    "6619136": "NC",
+    "6635520": "CN",
+    "6644992": "TW",
+    "6645248": "CN",
+    "6651904": "KR",
+    "6684672": "JP",
+    "6701056": "CN",
+    "6709248": "JP",
+    "6710272": "CN",
+    "6711040": "TW",
+    "6711296": "CN",
+    "6717440": "JP",
+    "6750208": "AU",
+    "6815744": "CN",
+    "7077888": "TH",
+    "7208960": "JP",
+    "7225344": "CN",
+    "7237632": "NZ",
+    "7238656": "CN",
+    "7241728": "JP",
+    "7340032": "AU",
+    "7864320": "CN",
+    "8323072": "SG",
+    "8388608": "CN",
+    "8389632": "AU",
+    "8390656": "CN",
+    "8404992": "ID",
+    "8421376": "JP",
+    "8454144": "CN",
+    "8912896": "TW",
+    "9175040": "JP",
+    "9437184": "CN",
+    "10485760": "AU",
+    "10990080": "HK",
+    "10990592": "AU",
+    "10991104": "SG",
+    "10991616": "AU",
+    "10992128": "GB",
+    "10992640": "HK",
+    "10995712": "SG",
+    "10998784": "GB",
+    "10999808": "AU",
+    "12582912": "CN",
+    "13026816": "US",
+    "13027328": "CN",
+    "13238272": "KR",
+    "13303808": "JP",
+    "13325312": "US",
+    "13325824": "JP",
+    "13336576": "CN",
+    "13346816": "ID",
+    "13347840": "CN",
+    "13352960": "JP",
+    "13369344": "CN",
+    "13631488": "IN",
+    "14680064": "CN",
+    "15138186": "HK",
+    "15138187": "CN",
+    "15335424": "SG",
+    "15351808": "CN",
+    "15353856": "AU",
+    "15354880": "CN",
+    "15368192": "AU",
+    "15373312": "SG",
+    "15373824": "AU",
+    "15400960": "KR",
+    "15466496": "CN",
+    "16384000": "KR",
+    "16449536": "CN",
+    "16450560": "NP",
+    "16451584": "CN",
+    "16473856": "TW",
+    "16474112": "CN",
+    "16711680": "ID"
+}