jnc_api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb496cf77ffdd9ffb87bd9d7d33a897546d32f2266d07bb1daab3620d48e235
-  data.tar.gz: 6b8bad8863037477e53977329d39149839769a61d5443f530b647510a8ab0924
+  metadata.gz: 3974d29ba88445303cbe19210402f6b3acfb1ad8aa9ca9ee5f662025f04a9ab0
+  data.tar.gz: b50c7ba9e5ff1666565241497a974c35fef74ba957037d476d0a169d317b4ad9
 SHA512:
-  metadata.gz: 24f6fa7999c012f0870e23d9fec16e3dc6076306da1cc84e7a470a831bdf9e6d56eef338440c3d7dc5ba1b05196657280c9d0f11f093898b5646e78317d53658
-  data.tar.gz: 798236a71e88c3b8b50c0b8a789fcd6b0f31304a5039274b65d945612c71ee0a042ce93d8356b2665605f342d8b29c1b4a514300b9987b17e16c7af04be98cde
+  metadata.gz: f5849dc5efaf3877966a24d1d399e41b1aaacece2969a9e1dcd05924c38712b1906f24d249b3a11144fb888f3edfaea4de1f6e96180463aab5cf64555a875901
+  data.tar.gz: 0ed4905c22b8ae2ea72d125bab66df8ff544879ecb6f8196afa853457aab45bf5246220c423066566422963d6fbde0bca0fb0775d67f496f757d36f5c25b423a

data/examples/feed/models.rb

@@ -46,8 +46,26 @@ ActiveRecord::Schema.define do
       t.timestamps
     end
   end
+
+  unless table_exists?(:manga_parts)
+    create_table :manga_parts, force: :cascade do |t|
+      t.integer :part_id, null: false
+      t.text :uuid
+      t.text :ngtoken
+      t.text :kgtoken
+      t.text :webpub
+      t.timestamps
+    end
+  end
+
 end
 
 class Part < ActiveRecord::Base
+  has_many :manga_parts
   serialize :crypt_data, coder: JSON
 end
+
+class MangaPart < ActiveRecord::Base
+  belongs_to :part
+  serialize :webpub, coder: JSON
+end

data/examples/feed/tracker.rb

@@ -23,7 +23,7 @@ gemfile do
   gem "activerecord", "~> 7.1", require: "active_record"
   gem "sqlite3", "~> 1.4", require: "sqlite3"
   gem "addressable", "~> 2.8", require: "addressable"
-  gem 'optparse', require: "optparse"
+  gem "optparse", require: "optparse"
 
   gem "jnc_api", path: "../..", require: "jnc_api"
 end
@@ -55,18 +55,22 @@ def assign_part_from_json(part, p)
   part.series_type = p["type"]
   part.legacy_id = p["partLegacyId"]
   part.title = p["partTitle"]
-  part.updated = p["updated"]
   part.clear_data = p["clearData"]
 end
 
 options = {}
-OptionParser.new do |opts|
-  opts.on("--slug=SLUG", "Only download this part as identified by the slug") do |s|
-    options[:slug] = s
+OptionParser
+  .new do |opts|
+    opts.on(
+      "--slug=SLUG",
+      "Only download this part as identified by the slug"
+    ) { |s| options[:slug] = s }
   end
-end.parse!
+  .parse!
 
-user_id = JSON.parse(api.me)["legacyId"]
+me = api.me
+puts me
+user_id = JSON.parse(me)["legacyId"]
 
 if options[:slug]
   opt_slug = options[:slug]
@@ -74,6 +78,7 @@ if options[:slug]
   part = Part.find_or_create_by(slug: opt_slug)
 
   assign_part_from_json(part, p)
+  part.updated = p["updated"]
 
   part.save!
 
@@ -96,39 +101,51 @@ else
 
     # skip items if the feed item is already seen
     if part.date_published &&
-        item["date_published"].to_datetime == part.date_published.to_datetime
+         item["date_published"].to_datetime == part.date_published.to_datetime
       puts "Skipping part #{part.slug} (feed item already seen)"
+
       next
     end
 
-    sleep 3
+    puts "sleeping for 5s"
+    sleep 5
 
     p = JSON.parse(api.parts_data(slug))
-
     assign_part_from_json(part, p)
 
-    part.image = item["image"]
-    part.date_published = item["date_published"]
-
-    part.save!
-
-    # skip items that are not novels e.g. manga
-    # we currently have no way to decode the manga parts
-    if p["type"] != "NOVEL"
-      puts "Skipping part #{part.slug} (not NOVEL type unsupported)"
-      next
-    end
-
     # skip items if the part is already up-to-date
     if part.data && p["updated"].to_datetime == part.updated.to_datetime
       puts "Skipping part #{part.slug} (feed item updated)"
+
       next
     end
 
-    e = api.embed(p["partLegacyId"])
+    # note: we currently have no way to descramble the manga parts
+    if p["type"] == "MANGA"
+      puts "part #{part.slug} is manga, downloading webpub"
+      tokens = JSON.parse(api.manga_parts(part.legacy_id))
+      manga_part = part.manga_parts.find_or_create_by(uuid: tokens["uuid"])
+      manga_part.uuid = tokens["uuid"]
+      manga_part.ngtoken = tokens["ngtoken"]
+      manga_part.kgtoken = tokens["kgtoken"]
+
+      puts tokens
+      puts "sleeping for 30s"
+      sleep 5
+
+      manga_part.webpub = api.webpub(tokens["uuid"], tokens["ngtoken"])
+      manga_part.save!
+    else
+      e = api.embed(p["partLegacyId"])
+
+      part.data = e
+      part.crypt_data = p["cryptData"]
+    end
+
+    part.image = item["image"]
+    part.date_published = item["date_published"]
+    part.updated = p["updated"]
 
-    part.data = e
-    part.crypt_data = p["cryptData"]
     part.save!
 
     puts "Updated part #{part.slug}"

data/lib/jnc_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JncApi
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/jnc_api.rb

@@ -32,7 +32,7 @@ module JncApi
     embed: "https://labs.j-novel.club/embed/",
     completion: "https://labs.j-novel.club/app/v1/me/completion",
     manga_parts: "https://api.j-novel.club/api/mangaParts",
-    webpub: "https://m11.j-novel.club/nebel/wp",
+    webpub: "https://m11.j-novel.club/nebel/wp"
   }
 
   class Api
@@ -44,7 +44,7 @@ module JncApi
           routes[:login] + "?format=json",
           body:
             JSON.generate(
-              {"login" => login, "password" => password, "slim" => true}
+              { "login" => login, "password" => password, "slim" => true }
             ),
           headers: {
             "Content-Type" => "application/json"
@@ -61,8 +61,15 @@ module JncApi
     def initialize(routes: V1_ROUTES, token: nil)
       @routes = routes
       @token = token
-      @default_headers = {"Content-Type" => "application/json"}
-      @bearer = {"Authorization" => "Bearer #{@token}"}
+      @default_headers = {
+        "User-Agent" =>
+          "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:127.0) Gecko/20100101 Firefox/127.0",
+        "Accept" =>
+          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+        "Accept-Language" => "en-US,en;q=0.5",
+        "Content-Type" => "application/json"
+      }
+      @bearer = { "Authorization" => "Bearer #{@token}" }
     end
 
     def series_list(limit: 500, skip: 0)
@@ -163,9 +170,10 @@ module JncApi
     # we can't seem to use bearer tokens for the manga endpoints
     def manga_parts(part_id)
       response =
-      HTTParty.get(
-        @routes[:manga_parts] + "/#{part_id}/token?access_token=#{@token}",
-      )
+        HTTParty.get(
+          @routes[:manga_parts] + "/#{part_id}/token?access_token=#{@token}",
+          headers: @default_headers
+        )
 
       if response.success?
         response.body
@@ -178,10 +186,12 @@ module JncApi
     # likely for cheaper static hosting (as long as the locations are
     # difficult to guess such as uuid)
     def webpub(uuid, ngtoken)
-      response = HTTParty.post(
-        @routes[:webpub] + "/#{part_id}",
-        body: ngtoken,
-      )
+      response =
+        HTTParty.post(
+          @routes[:webpub] + "/#{uuid}",
+          body: ngtoken,
+          headers: @default_headers
+        )
 
       if response.success?
         response.body
@@ -189,6 +199,5 @@ module JncApi
         raise Error.new(response.inspect)
       end
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jnc_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - parasquid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Light wrapper for the J-Novel Club API.