wiki-server 0.22.2 → 0.23.0

package/lib/server.coffee

@@ -652,7 +652,7 @@ module.exports = exports = (argv) ->
       if not page.journal
         page.journal = []
       if action.fork
-        page.journal.push({type: "fork", site: action.fork})
+        page.journal.push({type: "fork", site: action.fork, date: action.date - 1})
         delete action.fork
       page.journal.push(action)
       pagehandler.put req.params[0], page, (e) ->
@@ -674,7 +674,13 @@ module.exports = exports = (argv) ->
       pagehandler.saveToRecycler req.params[0], (err) ->
         if err and err isnt 'page does not exist' 
           console.log "Error saving #{req.params[0]} before fork: #{err}"
-        remoteGet(action.fork, req.params[0], actionCB)
+        if action.forkPage
+          forkPageCopy = JSON.parse(JSON.stringify(action.forkPage))
+          delete action.forkPage
+          actionCB(null, forkPageCopy)
+        else
+          # Legacy path, new clients will provide forkPage on implicit forks.
+          remoteGet(action.fork, req.params[0], actionCB)
     else if action.type is 'create'
       # Prevent attempt to write circular structure
       itemCopy = JSON.parse(JSON.stringify(action.item))
@@ -688,10 +694,10 @@ module.exports = exports = (argv) ->
     else if action.type == 'fork'
       pagehandler.saveToRecycler req.params[0], (err) ->
         if err then console.log "Error saving #{req.params[0]} before fork: #{err}"
-        if action.item # push
-          itemCopy = JSON.parse(JSON.stringify(action.item))
-          delete action.item
-          actionCB(null, itemCopy)
+        if action.forkPage # push
+          forkPageCopy = JSON.parse(JSON.stringify(action.forkPage))
+          delete action.forkPage
+          actionCB(null, forkPageCopy)
         else # pull
           remoteGet(action.site, req.params[0], actionCB)
     else

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wiki-server",
   "description": "A Federated Wiki Server",
-  "version": "0.22.2",
+  "version": "0.23.0",
   "author": {
     "name": "Ward Cunningham",
     "email": "ward@c2.com",
@@ -51,7 +51,7 @@
     "mocha": "^10.2.0",
     "should": "^13.2.3",
     "supertest": "^6.3.3",
-    "wiki-client": "^0.27.0",
+    "wiki-client": "^0.27.1",
     "wiki-plugin-activity": "^0.5.0",
     "wiki-plugin-video": "^0.3.0"
   },

package/test/server.coffee

@@ -4,7 +4,7 @@ server = require '..'
 path = require 'path'
 random = require '../lib/random_id'
 testid = random()
-argv = require('../lib/defaultargs.coffee')({data: path.join('/tmp', 'sfwtests', testid), packageDir: path.join(__dirname, '..', 'node_modules'), port: 55555, security_legacy: true})
+argv = require('../lib/defaultargs.coffee')({data: path.join('/tmp', 'sfwtests', testid), packageDir: path.join(__dirname, '..', 'node_modules'), port: 55557, security_legacy: true})
 
 describe 'server', ->
   app = {}
@@ -21,7 +21,7 @@ describe 'server', ->
     ))
 
 
-  request = request('http://localhost:55555')
+  request = request('http://localhost:55557')
 
   # location of the test page
   loc = path.join('/tmp', 'sfwtests', testid, 'pages', 'adsf-test-page')