Merge pull request #68 from axi92/feature/moment2luxon

replaced moment with luxon, add timezone support

Author: axi92

index.js

@@ -1,12 +1,11 @@
 const scrapeIt = require("scrape-it");
-const moment = require('moment');
-const momentTZ = require('moment-timezone');
 const events = require('events');
 const schedule = require('node-schedule');
 const debug = require('debug')('steam-workshop-scraper');
+const { DateTime, Settings } = require("luxon");
 
 class SteamWorkshopScraper {
-  constructor() {
+  constructor(timeZoneName = undefined) {
     this.workshopMap = new Map();
     this.schedule = undefined;
     this.workShopUrlInfo = 'https://steamcommunity.com/sharedfiles/filedetails/?id=';
@@ -59,6 +58,12 @@ class SteamWorkshopScraper {
     this.schedule = schedule.scheduleJob('28 * * * * *', function () {
       this.TriggerUpdate();
     }.bind(this));
+    if(timeZoneName != undefined){
+      Settings.defaultZone = timeZoneName;
+      if(Settings.defaultZone.valid != true){
+        throw new Error('Timezone invalid for constructor SteamWorkshopScraper: ' + timeZoneName)
+      }
+    }
   }
 
   async TriggerUpdate(){
@@ -153,30 +158,25 @@ class SteamWorkshopScraper {
 
   ParseSteamTime(string) {
     debug('ParseStreamTime:', string);
-    if (string.match('[0-9]{4}')) {
-      let parsed = moment(string, 'DD MMM, YYYY @ h:mma').format('YYYY-MM-DD HH:mm');
-      let a = momentTZ.tz(parsed, 'America/Los_Angeles');
-      if (a.isValid()) {
-        var time = moment(a).local();
-      } else {
-        console.error('not valid date2');
-      }
+    var steamDefaultTimezone = 'America/Los_Angeles';
+    var time;
+    let time1 = DateTime.fromFormat(string, "d MMM, yyyy @ h:ma", { locale: 'en', zone: steamDefaultTimezone });
+    let time2 = DateTime.fromFormat(string, "d MMM @ h:ma", { locale: 'en', zone: steamDefaultTimezone });
+    let time3 = DateTime.fromFormat(string, "MMM d, yyyy @ h:ma", { locale: 'en', zone: steamDefaultTimezone }); // github workflow format
+    let time4 = DateTime.fromFormat(string, "MMM d @ h:ma", { locale: 'en', zone: steamDefaultTimezone }); // github workflow format for current year
+    if(time1.isValid){
+      time = time1;
+    } else if(time2.isValid){
+      time = time2;
+    } else if(time3.isValid){
+      time = time3;
+    } else if(time4.isValid){
+      time = time4;
     } else {
-      let parsed = moment(string, 'DD MMM @ h:mma').format('YYYY-MM-DD HH:mm');
-      var a = momentTZ.tz(parsed, 'America/Los_Angeles');
-      try {
-        if (a.isValid()) {
-          var time = moment(a).local();
-        } else {
-          console.error('not valid date2');
-        }
-      } catch (error) {
-        debug('var a is:');
-        debug(a);
-        console.error('try catch error:', error);
-      }
+      throw new Error('No time format was found in parser for: ' + string);
     }
-    return time.toISOString(true);
+    time = time.setZone(Settings.defaultZone);
+    return time.toString(true);
   }
 }
 

package-lock.json

@@ -18,6 +18,7 @@
   "dependencies": {
     "async": "^3.2.0",
     "debug": "^4.3.2",
+    "luxon": "^3.3.0",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.42",
     "node-schedule": "^2.1.1",

package.json

@@ -1,7 +1,7 @@
 const SteamWorkshopScraper = require('../index.js');
-const sws = new SteamWorkshopScraper();
+const sws = new SteamWorkshopScraper('Universal');
 var assert = require('assert');
-
+const { DateTime } = require("luxon");
 
 describe('SteamWorkshopScraper', function () {
   it('should show 18 entries', async function () {
@@ -54,15 +54,34 @@ describe('SteamWorkshopScraper', function () {
 
   it('GetChangeLog check text and timePosted', async function () {
     await sws.GetChangeLog(478528785).then(function (data) { // very old mod
-      // console.log('data', data.data[0].text);
       assert.equal(data.data[0].text, 'Version 1.0');
-      assert.equal(data.data[0].timePosted, '2015-07-09T23:59:00.000+02:00');
+      assert.equal(data.data[0].timePosted, '2015-07-09T21:59:00.000+00:00');
     });
   });
 
   it('GetInfo never updated mod', async function () {
     await sws.GetInfo(518030553).then(function (data) {
-      // console.log(data);
+      assert.equal(data.title, 'TXM: Turret Expansion Mod');
+      assert.equal(data.size, '0.036 MB');
+      assert.equal(data.timePublished, '2015-09-14T01:52:00.000+00:00');
+      assert.equal(data.timeUpdated, '2015-09-14T01:52:00.000+00:00');
+      assert.equal(data.image, 'https://steamuserimages-a.akamaihd.net/ugc/421440386976795132/B34EDDA953337D1CD05DBE82BAAA397B0520AB50/?imw=268&imh=268&ima=fit&impolicy=Letterbox&imcolor=%23000000&letterbox=true');
+    });
+  });
+
+  it('GetInfo active updated mod', async function () {
+    await sws.GetInfo(731604991).then(function (data) {
+      assert.equal(data.title, 'Structures Plus (S+)');
+      assert.equal(data.size, '58.174 MB');
+      assert.equal(data.timePublished, '2016-07-26T02:40:00.000+00:00');
+      assert.equal(data.timeUpdated.includes(DateTime.now().year), true);
+      assert.equal(data.image, 'https://steamuserimages-a.akamaihd.net/ugc/1020574589494908839/7C3E05B2D3568E166D1E9B0A7597782934F2A153/?imw=268&imh=268&ima=fit&impolicy=Letterbox&imcolor=%23000000&letterbox=true');
+    });
+  });
+
+  it('Timezone', async function () {
+    const swsTZ = new SteamWorkshopScraper('Europe/Vienna');
+    await swsTZ.GetInfo(518030553).then(function (data) {
       assert.equal(data.title, 'TXM: Turret Expansion Mod');
       assert.equal(data.size, '0.036 MB');
       assert.equal(data.timePublished, '2015-09-14T03:52:00.000+02:00');