stremio-official-addons 1.5.4 → 1.5.7

package/README.md

@@ -1,27 +1,109 @@
 # stremio-official-addons
+[![npm][stremio-official-addons version badge]][v1-npm-link] ![downloads][stremio-official-addons downloads badge]
+
+[![npm][@stremio/stremio-official-addons version badge]][v2-npm-link] ![downloads][@stremio/stremio-official-addons downloads badge] [![crates.io version badge][crates version]][v2-crates-io-link] ![Crates.io Downloads (latest version)][crates.io downloads badge]
 
 All the stremio official add-ons, in `AddonCollection.load()` format
 
 The `index.js` file is meant to be generated from the output of `AddonCollection.save()`
 
 
-## Update
+## Changing the official add-ons
 
-To re-generate `index.json` you can do `scripts/gen.js > index.json`
+To change what's contained in this module, you have to change [`scripts/gen.js`](./scripts/gen.js) for **version 1** and [`official-addons-v2/scripts/build.js`](./official-addons-v2/scripts/build.js) for **version 2**.
 
+Besides changing this module, you have to update all it's dependant packages, most notably:
 
-## Changing the official add-ons
+* stremio-api-workers: this is the **most important one**, since it will affect `addonsofficialcollection.json` and therefore the addonCollection API, and therefore all running apps should respect it ([`stremio-official-addons@1`][v1-npm-link] package)
 
-To change what's contained in this module, you have to change `scripts/gen.js`
+* stremio: the desktop/web app ([`stremio-official-addons@1` package][v1-npm-link])
 
-Besides changing this module, you have to update all it's dependant packages, most notably:
+* stremio-rn: the react native app ([`stremio-official-addons@1` package][v1-npm-link])
+
+* stremio-web: the new desktop/web app ([`@stremio/stremio-official-addons@2` package][v2-npm-link])
+
+* stremio-core: the core for most applications including web, android tv, android, etc. ([`stremio-official-addons@2` crate][v2-crates-io-link])
+
+* stremio-api-legacy-shim: this one does not *depend on* this module, and does not include it, but it contains a separate list of official add-ons in `addons/official.js` that is respected by all apps using the legacy endpoints **ARCHIVED**
+
+# Release new version
+
+## Version 1.XX.XX
+To release a new version for v1 **npm** package you need to:
+
+1. Bump [`package.json`](./package.json)
+
+1.1. Make sure to update [`package-lock.json`](./package-lock.json):
+
+`npm i --package-lock-only`
+
+2. Make a new tag
+
+`git tag -a v1.XX.XX -m "Tag for releases v1.XX.XX"`
+
+3. Push it to the repo
+
+`git push -u origin v1.XX.XX`
+
+4. Create a [new release](https://github.com/Stremio/stremio-official-addons/releases) using the version as a title, e.g. `v1.5.6` and automatically generate changes from previous tag.
+
+5. The [`publish` workflow](./.github/workflows/publish.yml) will run the `v1` job and will:
+   1. Build [`stremio-official-addons@1`][v1-npm-link] package
+   2. Publish the [package on npm][v1-npm-link]
+
+## Version 2.XX.XX
+
+To release a new version for v2 **npm** and **crate** packages you need to:
+1. Bump [`official-addons-v2/package.json`](./official-addons-v2/package.json)
+
+1.1. Make sure to update [`package-lock.json`](./package-lock.json):
+
+`npm i --package-lock-only`
+
+2. Bump [`official-addons-v2/Cargo.toml`](./official-addons-v2/Cargo.toml)
+
+2.1. Make sure to update [`Cargo.lock`](./Cargo.lock):
+
+`cargo update -p stremio-official-addons`
+
+3. Make a new tag
+
+`git tag -a v2.XX.XX -m "Tag for releases v2.XX.XX"`
+
+4. Push it to the repo
+
+`git push -u origin v2.XX.XX`
+
+5. Create a [new release](https://github.com/Stremio/stremio-official-addons/releases) using the version as a title, e.g. `v2.0.12` and automatically generate changes from previous tag.
+
+6. The [`publish` workflow](./.github/workflows/publish.yml) will run the `v2` job and will:
+   1. Build [`@stremio/stremio-official-addons@2`][v2-npm-link] package
+   2. Publish the [package on npm][v2-npm-link]
+   3. Publish the [crate on crates.io][v2-crates-io-link]
+
+# License
+
+Both packages are licensed under the MIT license:
+- [`stremio-official-addons` v1 MIT license](./LICENSE.md)
+- [`stremio-official-addons` v2 MIT license](./official-addons-v2/LICENSE.md)
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the project by you, shall be licensed as MIT,
+without any additional terms or conditions.
+
+[v1-npm-link]: https://www.npmjs.com/package/stremio-official-addons
+[stremio-official-addons downloads badge]: https://img.shields.io/npm/dm/stremio-official-addons?label=stremio-official-addons%20downloads&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2Fstremio-official-addons
 
-* stremio-api-workers: this is the **most important one**, since it will affect `addonsofficialcollection.json` and therefore the addonCollection API, and therefore all running apps should respect it
+[stremio-official-addons version badge]: https://img.shields.io/npm/v/stremio-official-addons?label=stremio-official-addons&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2Fstremio-official-addons
 
-* stremio: the desktop/web app
+[v2-npm-link]: https://www.npmjs.com/package/@stremio/stremio-official-addons
+[@stremio/stremio-official-addons downloads badge]: https://img.shields.io/npm/dm/%40stremio/stremio-official-addons?label=%40stremio%2Fstremio-official-addons%20downloads&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40stremio%2Fstremio-official-addons
 
-* stremio-rn: the react native app
+[@stremio/stremio-official-addons version badge]: https://img.shields.io/npm/v/%40stremio/stremio-official-addons?label=%40stremio%2Fstremio-official-addons&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40stremio%2Fstremio-official-addons
 
-* stremio-web: the new desktop/web app
 
-* stremio-api-legacy-shim: this one does not *depend on* this module, and does not include it, but it contains a separate list of official add-ons in `addons/official.js` that is respected by all apps using the legacy endpoints 
+[v2-crates-io-link]: https://crates.io/crates/stremio-official-addons
+[crates version]: https://img.shields.io/crates/v/stremio-official-addons
+[crates.io downloads badge]: https://img.shields.io/crates/dv/stremio-official-addons?label=Crates.io%20downloads%20(latest%20version)

package/index.json

@@ -2,7 +2,7 @@
     {
         "manifest": {
             "id": "com.linvo.cinemeta",
-            "version": "3.0.10",
+            "version": "3.0.12",
             "description": "The official addon for movie and series catalogs",
             "name": "Cinemeta",
             "resources": [
@@ -211,6 +211,8 @@
                     "type": "movie",
                     "id": "year",
                     "genres": [
+                        "2025",
+                        "2024",
                         "2023",
                         "2022",
                         "2021",
@@ -320,6 +322,8 @@
                         {
                             "name": "genre",
                             "options": [
+                                "2025",
+                                "2024",
                                 "2023",
                                 "2022",
                                 "2021",
@@ -444,6 +448,8 @@
                     "type": "series",
                     "id": "year",
                     "genres": [
+                        "2025",
+                        "2024",
                         "2023",
                         "2022",
                         "2021",
@@ -513,6 +519,8 @@
                         {
                             "name": "genre",
                             "options": [
+                                "2025",
+                                "2024",
                                 "2023",
                                 "2022",
                                 "2021",
@@ -724,7 +732,7 @@
                         {
                             "name": "lastVideosIds",
                             "isRequired": true,
-                            "optionsLimit": 500
+                            "optionsLimit": 100
                         }
                     ],
                     "extraSupported": [
@@ -734,13 +742,30 @@
                         "lastVideosIds"
                     ],
                     "name": "Last videos"
+                },
+                {
+                    "type": "series",
+                    "id": "calendar-videos",
+                    "extra": [
+                        {
+                            "name": "calendarVideosIds",
+                            "isRequired": true,
+                            "optionsLimit": 100
+                        }
+                    ],
+                    "extraSupported": [
+                        "calendarVideosIds"
+                    ],
+                    "extraRequired": [
+                        "calendarVideosIds"
+                    ],
+                    "name": "Calendar videos"
                 }
             ],
             "behaviorHints": {
                 "newEpisodeNotifications": true
             }
         },
-        "transportName": "http",
         "transportUrl": "https://v3-cinemeta.strem.io/manifest.json",
         "flags": {
             "official": true,
@@ -809,10 +834,10 @@
                 }
             ]
         },
-        "transportName": "http",
         "transportUrl": "https://v3-channels.strem.io/manifest.json",
         "flags": {
-            "official": true
+            "official": true,
+            "protected": false
         }
     },
     {
@@ -834,10 +859,10 @@
                 "tt"
             ]
         },
-        "transportName": "http",
         "transportUrl": "https://watchhub.strem.io/manifest.json",
         "flags": {
-            "official": true
+            "official": true,
+            "protected": false
         }
     },
     {
@@ -872,10 +897,35 @@
                 "tt"
             ]
         },
-        "transportName": "http",
         "transportUrl": "https://caching.stremio.net/publicdomainmovies.now.sh/manifest.json",
         "flags": {
-            "official": true
+            "official": true,
+            "protected": false
+        }
+    },
+    {
+        "manifest": {
+            "id": "org.stremio.opensubtitlesv3",
+            "version": "1.0.0",
+            "name": "OpenSubtitles v3",
+            "description": "OpenSubtitles v3 Addon for Stremio",
+            "catalogs": [],
+            "resources": [
+                "subtitles"
+            ],
+            "types": [
+                "movie",
+                "series"
+            ],
+            "idPrefixes": [
+                "tt"
+            ],
+            "logo": "http://www.strem.io/images/addons/opensubtitles-logo.png"
+        },
+        "transportUrl": "https://opensubtitles-v3.strem.io/manifest.json",
+        "flags": {
+            "official": true,
+            "protected": false
         }
     },
     {
@@ -893,12 +943,15 @@
                 "movie",
                 "other"
             ],
-            "catalogs": []
+            "catalogs": [],
+            "behaviorHints": {
+                "adult": false
+            }
         },
-        "transportName": "legacy",
         "transportUrl": "https://opensubtitles.strem.io/stremio/v1",
         "flags": {
-            "official": true
+            "official": true,
+            "protected": false
         }
     },
     {
@@ -936,11 +989,10 @@
             ],
             "catalogs": []
         },
-        "transportName": "http",
         "transportUrl": "http://127.0.0.1:11470/local-addon/manifest.json",
         "flags": {
             "official": true,
             "protected": true
         }
     }
-]
+]

package/official-addons-v2/README.md

@@ -0,0 +1,32 @@
+# Stremio official addons (v2) packages
+
+## NPM `@stremio/stremio-official-addons`
+[![npm version badge][version badge]][v2-npm-link] ![Downloads monthly][downloads badge]
+
+## Crates.io `stremio-official-addons`
+[![crates.io version badge][crates version]][v2-crates-io-link] ![Crates.io Downloads (latest version)][crates.io downloads badge]
+
+All of the stremio official addons.
+
+## Build
+
+To re-generate `addons.json` you can run `npm run build`
+
+## Changing the official addons collection
+
+To change what's contained in this module, you have to change `scripts/build.js`
+
+Besides changing this module, you have to update all it's dependant packages.
+
+# License
+
+This project is licensed under the [MIT license](./LICENSE.md).
+
+[v2-npm-link]: https://www.npmjs.com/package/@stremio/stremio-official-addons
+[downloads badge]: https://img.shields.io/npm/dm/%40stremio/stremio-official-addons?label=%40stremio%2Fstremio-official-addons%20downloads&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40stremio%2Fstremio-official-addons
+
+[version badge]: https://img.shields.io/npm/v/%40stremio/stremio-official-addons?label=%40stremio%2Fstremio-official-addons&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40stremio%2Fstremio-official-addons
+
+[v2-crates-io-link]: https://crates.io/crates/stremio-official-addons
+[crates version]: https://img.shields.io/crates/v/stremio-official-addons
+[crates.io downloads badge]: https://img.shields.io/crates/dv/stremio-official-addons?label=Crates.io%20downloads%20(latest%20version)

package/official-addons-v2/package.json

@@ -0,0 +1,27 @@
+{
+    "name": "@stremio/stremio-official-addons",
+    "version": "2.0.12",
+    "description": "All of the stremio official addons",
+    "homepage": "https://stremio.com",
+    "author": "Smart Code OOD",
+    "main": "addons.json",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/stremio/stremio-official-addons.git"
+    },
+    "keywords": [
+        "official",
+        "addons",
+        "stremio"
+    ],
+    "scripts": {
+        "build": "node ./scripts/build.js"
+    },
+    "devDependencies": {
+        "@stremio/stremio-core-validator": "2.0.2",
+        "node-fetch": "2.6.7",
+        "stremio-addon-client": "1.16.1",
+        "stremio-local-addon": "https://git@github.com/Stremio/stremio-local-addon#79cd88c32aa26270af8b662fa7bd92b657f6e14f"
+    }
+}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "stremio-official-addons",
-  "version": "1.5.4",
+  "version": "1.5.7",
   "description": "All the stremio official add-ons, in AddonCollection.load() format",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "./scripts/gen.js > index.json"
   },
   "repository": {
     "type": "git",
@@ -19,8 +20,13 @@
   "bugs": {
     "url": "https://github.com/Stremio/stremio-official-addons/issues"
   },
-  "homepage": "https://github.com/Stremio/stremio-official-addons#readme",
+  "homepage": "https://stremio.com",
   "devDependencies": {
-    "stremio-addon-client": "^1.5.2"
-  }
-}
+    "stremio-addon-client": "^1.5.2",
+    "stremio-local-addon": "https://git@github.com/Stremio/stremio-local-addon#79cd88c32aa26270af8b662fa7bd92b657f6e14f"
+  },
+  "workspaces": [
+    ".",
+    "official-addons-v2"
+  ]
+}

package/scripts/gen.js

@@ -1,35 +0,0 @@
-#!/usr/bin/env node
-
-const client = require('stremio-addon-client')
-
-const ENDPOINTS = [
-    "https://v3-cinemeta.strem.io/manifest.json",
-    "https://v3-channels.strem.io/manifest.json",
-    "https://watchhub.strem.io/manifest.json",
-    "https://caching.stremio.net/publicdomainmovies.now.sh/manifest.json",
-    "https://opensubtitles.strem.io/stremio/v1",
-    "http://127.0.0.1:11470/local-addon/manifest.json",
-]
-
-const col = new client.AddonCollection()
-
-Promise.all(ENDPOINTS.map(url => client.detectFromURL(url)))
-.then(function(responses) {
-    responses.forEach(function(x, i) {
-       if (!x.addon) return
-	if (JSON.stringify(x.addon.manifest).length > 8192) throw 'manifest bigger than 8kb - aborting!'
-        x.addon.flags = isProtected(x, i) ? { official: true, protected: true } : { official: true }
-        col.add(x.addon)
-    })
-})
-.then(function() {
-    console.log(JSON.stringify(col.save(), null, 4))
-})
-
-function isProtected(x, i) {
-	// cinemeta
-	if (i === 0) return true
-
-	// local
-	if (x.addon.manifest.id.match('local')) return true
-}