gitmark 0.0.40 → 0.0.46

package/bin/git-mark

@@ -18,7 +18,8 @@ globalThis.data = {
   privkey: '132e7465a63e30a74c5b0deae3573033319e9de18a84878613eaa21878b2b56b',
   hash: 'b3e8f5735849af7f18a13ead08532043a7f82153',
   genesis: null,
-  branch: 'gh-pages'
+  branch: 'gh-pages',
+  notify: 'http://gitmark.me:4444'
 }
 
 // FUNCTIONS
@@ -106,7 +107,7 @@ data.genesis = argv.genesis || data.genesis
 console.log('data', data)
 
 var lastCommit = commits.filter(i => {
-  return i.subject.match(/^gitmark/)
+  return i.subject.match(/^gitmark[ :][A-Fa-f0-9]/)
 })
 if (lastCommit && lastCommit[0] && lastCommit[0].subject) {
   lastCommit = lastCommit[0].subject
@@ -280,5 +281,9 @@ if (txexe && argv.send) {
     console.log('committing')
     $('git commit --allow-empty -m' + ' "gitmark ' + newtx.toString() + '"')
     $(`git push origin ${data.branch}`)
+
+    if (argv.notify) {
+      $(`./bin/notify.js gitmark:${newtx}:0`)
+    }
   }
 }

package/bin/git-mark-init

@@ -139,6 +139,14 @@ console.log('tx', tx)
 
 // create gitmark.json
 console.log('create gitmark.json and check in files')
+console.log(`{
+  "@id": "gitmark:${tx}:1",
+  "genesis": "gitmark:${tx}:1",
+  "nick": "gitmark",
+  "package": "./package.json",
+  "repository": "./"
+}`)
+
 
 // git mark genesis
 console.log('git mark --genesis ', tx)

package/bin/git-mark-verify

@@ -38,7 +38,7 @@ const options = {
   fields: ['hash', 'subject']
 }
 
-function getPrivKey () {
+function getPrivKey() {
   try {
     const fetchHeadDir = './.git/'
     var fetchHeadFile = fetchHeadDir + 'FETCH_HEAD'
@@ -82,9 +82,9 @@ if (commits.length === 1) {
 }
 
 console.log('Genesis tx need not be verified\n')
-for (var i = commits.length-1; i >= 0; i--) {
+for (var i = commits.length - 1; i >= 0; i--) {
   var subject = commits[i].subject
-  if (subject.match(/^gitmark/)) {
+  if (subject.match(/^gitmark[: ][A-Fa-f0-9]/)) {
     var hash = commits[i + 1].hash
     console.log()
     console.log(subject)
@@ -106,8 +106,8 @@ for (var i = commits.length-1; i >= 0; i--) {
 
     console.log(
       'https://chainz.cryptoid.info/marks/tx.dws?' +
-        subject.split(' ')[1].split(':')[0] +
-        '.htm'
+      subject.split(' ')[1].split(':')[0] +
+      '.htm'
     )
   }
 }

package/bin/notify.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+var WebSocket = require('ws');
+
+var secret = process.env['SECRET'] || 's'
+
+var uri = process.argv[3] || 'ws://localhost:4444'
+
+const ws = new WebSocket(uri)
+
+ws.on('open', function open() {
+  ws.send(`update ${process.argv[2] || 'a'} ${secret}`)
+  ws.close()
+})
+
+ws.on('message', function incoming(message) {
+  console.log('received: %s', message);
+});
+
+

package/gitmark.json

@@ -0,0 +1,7 @@
+{
+  "@id": "gitmark:59ff24db0321cb6b32a404815345b00ae68ca8b81150fbea6464ee10557e0fae:1",
+  "genesis": "gitmark:59ff24db0321cb6b32a404815345b00ae68ca8b81150fbea6464ee10557e0fae:1",
+  "nick": "gitmark",
+  "package": "./package.json",
+  "repository": "./"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitmark",
-  "version": "0.0.40",
+  "version": "0.0.46",
   "description": "gitmark",
   "main": "index.js",
   "scripts": {
@@ -29,6 +29,7 @@
     "fs": "^0.0.1-security",
     "gitlog": "^4.0.4",
     "minimist": "^1.2.5",
-    "tiny-secp256k1": "^1.1.6"
+    "tiny-secp256k1": "^1.1.6",
+    "ws": "^8.2.3"
   }
 }