wiki-server 0.21.1 → 0.21.3

package/.github/workflows/node.js.yml

@@ -0,0 +1,31 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x, 18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

package/lib/search.coffee

@@ -44,53 +44,37 @@ module.exports = exports = (argv) ->
         fs.close fd, (err) ->
           cb(err)
 
-  searchPageUpdate = (slug, page, origStory, cb) ->
+  searchPageUpdate = (slug, page, cb) ->
     # to update we have to remove the page first, and then readd it
     timeLabel = "SITE INDEX update #{slug} - #{wikiName}"
     console.time timeLabel
+    
     try
-      origText = origStory.reduce( extractPageText, '')
+      pageText = page.story.reduce( extractPageText, '')
     catch err
-      console.log "SITE INDEX *** #{wikiName} reduce to extract the original text on #{slug} failed", err.message
-      origText = ""
-    try
-      siteIndex.remove {
+      console.log "SITE INDEX *** #{wikiName} reduce to extract the text on #{slug} failed", err.message
+      pageText = ""
+    if siteIndex.has slug
+      siteIndex.replace {
         'id': slug
         'title': page.title
-        'content': origText
+        'content': pageText
+      }
+    else
+      siteIndex.add {
+        'id': slug
+        'title': page.title
+        'content': pageText
       }
-    catch err
-      # swallow error, if the page was not in index
-      console.log "SITE INDEX *** removing #{slug} from index failed", err unless err.message.includes('not in the index')
-
-    try
-      newText = page.story.reduce( extractPageText, '')
-    catch err
-      console.log "SITE INDEX *** #{wikiName} reduce to extract the new text on #{slug} failed", err.message
-      newText = ""
-    siteIndex.add {
-      'id': slug
-      'title': page.title
-      'content': newText
-    }
     console.timeEnd timeLabel
     cb()
 
-  searchPageRemove = (slug, title, origStory, cb) ->
+  searchPageRemove = (slug, cb) ->
     # remove page from index
     timeLabel = "SITE INDEX page remove #{slug} - #{wikiName}"
     console.time timeLabel
     try
-      origText = origStory.reduce( extractPageText, '')
-    catch err
-      console.log "SITE INDEX *** #{wikiName} reduce to extract the text for removing #{slug} failed", err.message
-      origText = ""
-    try
-      siteIndex.remove {
-        'id': slug
-        'title': title
-        'content': origText
-      }
+      siteIndex.discard slug 
     catch err
       # swallow error, if the page was not in index
       console.log "removing #{slug} from index #{wikiName} failed", err unless err.message.includes('not in the index')
@@ -140,14 +124,14 @@ module.exports = exports = (argv) ->
       switch item.action
         when "update"
           itself.start()
-          searchPageUpdate(item.slug, item.page, item.origStory, (e) ->
+          searchPageUpdate(item.slug, item.page, (e) ->
             process.nextTick( ->
               serial(queue.shift())
             )
           )
         when "remove"
           itself.start()
-          searchPageRemove(item.slug, item.title, item.origStory, (e) ->
+          searchPageRemove(item.slug, (e) ->
             process.nextTick( ->
               serial(queue.shift())
             )
@@ -172,7 +156,7 @@ module.exports = exports = (argv) ->
             # really need to extract text from the markdown, but for now just remove link brackets, urls...
             pageText += ' ' + currentItem.text.replace /\[{2}|\[(?:[\S]+)|\]{1,2}|\\n/g, ' '
           when 'html'
-            pageText += ' ' + currentItem.text.replace /<[^>]*>/g, ''
+            pageText += ' ' + currentItem.text.replace /<[^\>]*>?/g, ''
           else
             if currentItem.text?
               for line in currentItem.text.split /\r\n?|\n/
@@ -247,9 +231,9 @@ module.exports = exports = (argv) ->
         process.nextTick ( ->
           serial(queue.shift()))
       
-  itself.removePage = (slug, title, origStory) ->
+  itself.removePage = (slug) ->
     action = "remove"
-    queue.push({action, slug, title, origStory})
+    queue.push({action, slug })
     if Array.isArray(siteIndex) and !working
       itself.start()
       searchRestore (e) ->
@@ -258,9 +242,9 @@ module.exports = exports = (argv) ->
     else
       serial(queue.shift()) unless working
 
-  itself.update = (slug, page, origStory) ->
+  itself.update = (slug, page) ->
     action = "update"
-    queue.push({action, slug, page, origStory})
+    queue.push({action, slug, page})
     if Array.isArray(siteIndex) and !working
       itself.start()
       searchRestore( (e) ->

package/lib/server.coffee

@@ -610,12 +610,11 @@ module.exports = exports = (argv) ->
     actionCB = (e, page, status) ->
       #if e then return res.e e
       if status is 404
-        res.status(status).send(page)
+        # res.status(status).send(page)
+        return res.e page,status
       # Using Coffee-Scripts implicit returns we assign page.story to the
       # result of a list comprehension by way of a switch expression.
       try
-        # save the original page, so we can remove it from the index.
-        origStory = Object.assign([], page.story) or []
         page.story = switch action.type
           when 'move'
             action.order.map (id) ->
@@ -667,7 +666,7 @@ module.exports = exports = (argv) ->
       sitemaphandler.update(req.params[0], page)
 
       # update site index
-      searchhandler.update(req.params[0], page, origStory)
+      searchhandler.update(req.params[0], page)
 
     # log action
 
@@ -721,7 +720,6 @@ module.exports = exports = (argv) ->
     # we need the original page text to remove it from the index, so get the original text before deleting it
     pagehandler.get pageFile, (e, page, status) ->
       title = page.title
-      origStory = Object.assign([], page.story) or []
       pagehandler.delete pageFile, (err) ->
         if err
           res.status(500).send(err)
@@ -729,7 +727,7 @@ module.exports = exports = (argv) ->
           sitemaphandler.removePage pageFile
           res.status(200).send('')
           # update site index
-          searchhandler.removePage(req.params[0], title, origStory)
+          searchhandler.removePage(req.params[0])
 
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -33,7 +33,7 @@
     "glob": "^7.1.4",
     "lodash": "^4.17.19",
     "method-override": "^2.3.10",
-    "minisearch": "^5.0.0",
+    "minisearch": "^6.0.0",
     "mkdirp": "^0.5.5",
     "morgan": "^1.9.1",
     "node-fetch": "^2.6.1",
@@ -42,7 +42,7 @@
     "xml2js": "^0.4.23"
   },
   "scripts": {
-    "test": "mocha"
+    "test": "grunt mochaTest"
   },
   "devDependencies": {
     "grunt": "^1.0.4",

package/.travis.yml

@@ -1,12 +0,0 @@
-language: node_js
-node_js:
-  - "10"
-  - "12"
-  - "13"
-install:
-  - npm install
-before_install:
-  - npm install -g grunt-cli
-script:
-  - grunt mochaTest
-sudo: false