fixed appnet.link naming issue

Author: sequoiar

Dockerfile.bld

@@ -1,7 +1,7 @@
 #
-# AppNet.io building Dockerfile
+# AppNet.link building Dockerfile
 #
-# https://github.com/InstantWebP2P/appnet.io-controller
+# https://github.com/InstantWebP2P/appnet.link-controller
 # Copyright (c) 2020 Tom Zhou<appnet.link@gmail.com>
 
 # Pull base image.

Dockerfile.neo4j

@@ -1,7 +1,7 @@
 #
 # Neo4j building Dockerfile
 #
-# https://github.com/InstantWebP2P/appnet.io-controller
+# https://github.com/InstantWebP2P/appnet.link-controller
 # Copyright (c) 2020 Tom Zhou<appnet.link@gmail.com>
 
 # Pull base image.

Dockerfile.pkg

@@ -1,7 +1,7 @@
 #
-# AppNet.io packaging Dockerfile
+# AppNet.link packaging Dockerfile
 #
-# https://github.com/InstantWebP2P/appnet.io-controller
+# https://github.com/InstantWebP2P/appnet.link-controller
 # Copyright (c) 2020 Tom Zhou<appnet.link@gmail.com>
 
 # Pull base image.

README.md

@@ -1,5 +1,5 @@
-# appnet.io-controller
-AppNet.IO controller serivices to support [AppNet.io protocol](https://github.com/InstantWebP2P/appnet.io)
+# appnet.link-controller
+AppNet.IO controller serivices to support [AppNet.link protocol](https://github.com/InstantWebP2P/appnet.link)
 
 
 ### Prerequest
@@ -15,7 +15,7 @@ AppNet.IO controller serivices to support [AppNet.io protocol](https://github.co
 
 ### Install
 
-* appnet.io-controller depends on node-httpp, please build it from repo [node-httpp](https://github.com/InstantWebP2P/node-httpp.git)
+* appnet.link-controller depends on node-httpp, please build it from repo [node-httpp](https://github.com/InstantWebP2P/node-httpp.git)
 
 * clone this repo and install dependency modules
 
@@ -31,7 +31,7 @@ AppNet.IO controller serivices to support [AppNet.io protocol](https://github.co
 
     ` ~/node-httpp/node ./bin/srv.js `
 
-* now ready to serve [appnet.io client](https://github.com/InstantWebP2P/appnet.io)
+* now ready to serve [appnet.link client](https://github.com/InstantWebP2P/appnet.link)
 
 
 #### Install on Linux with Docker
@@ -78,8 +78,8 @@ AppNet.IO controller serivices to support [AppNet.io protocol](https://github.co
 * db/sdp.js.             - Session data model persistent in GraphDB
 * vurl.js.               - Virtual URL implementation
 
-* appnet.io-server.js    - AppNet.io protocol controller implementation
-* appnet.io-server-v2.js - AppNet.io protocol controller V2 implementation using SecureWebsocket and NaclCert
+* appnet.link-server.js    - AppNet.link protocol controller implementation
+* appnet.link-server-v2.js - AppNet.link protocol controller V2 implementation using SecureWebsocket and NaclCert
 
 * ssl.js                 - SSL/RSA certs generate utils
 * demos/                 - demos

appbld

@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 
 # check docker image for building
-if [ "$(docker images -q appnet-bld:4.0 2> /dev/null)" == "" ]; then
-  echo "Build Docker image as appnet-bld:4.0"
-  docker image build --rm --network host --compress -t appnet-bld:4.0 -f ./Dockerfile.bld .
+if [ "$(docker images -q appnet-bld:4.1 2> /dev/null)" == "" ]; then
+  echo "Build Docker image as appnet-bld:4.1"
+  docker image build --rm --network host --compress -t appnet-bld:4.1 -f ./Dockerfile.bld .
 fi
 
 # execute commands 
 if [ $# -ne 0 ]; then
   echo "$@ ..."
-  ###docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host --env DEBUG=appnet.io.srv,appnet.io appnet-bld:4.0 $@
-  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.0 $@
+  ###docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host --env DEBUG=appnet.io.srv,appnet.io appnet-bld:4.1 $@
+  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.1 $@
 else
   echo "Start building ..."
-  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.0 \
+  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.1 \
   bash -c "npm i --only=prod && ./tools/genSrvKey.bash 51dese.com"
 fi

appbld.cn

@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 
 # check docker image for building
-if [ "$(docker images -q appnet-bld:4.0 2> /dev/null)" == "" ]; then
-  echo "Build Docker image as appnet-bld:4.0"
-  docker image build --rm --network host --compress -t appnet-bld:4.0 -f ./Dockerfile.bld .
+if [ "$(docker images -q appnet-bld:4.1 2> /dev/null)" == "" ]; then
+  echo "Build Docker image as appnet-bld:4.1"
+  docker image build --rm --network host --compress -t appnet-bld:4.1 -f ./Dockerfile.bld .
 fi
 
 # execute commands 
 if [ $# -ne 0 ]; then
   echo "$@ ..."
-  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.0 $@
+  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.1 $@
 else
   echo "Start building ..."
-  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.0 \
+  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-bld:4.1 \
   bash -c "npm config set registry=http://registry.npm.taobao.org && \
            npm i --only=prod && ./tools/genSrvKey.bash 51dese.com"
 fi

appnet.io-server-v2.js renamed to appnet.link-server-v2.js

@@ -1,13 +1,13 @@
-// AppNet.IO name-server V2 implementation based SecureWebsocket and NaclCert, that works with appnet.io name-client
+// AppNet.IO name-server V2 implementation based SecureWebsocket and NaclCert, that works with appnet.link name-client
 // Copyright (c) 2014-present Tom Zhou<appnet.link@gmail.com>
 //
 
 'use strict';
-var debug  = require('debug')('appnet.io.srv.v2');
+var debug  = require('debug')('appnet.link.srv.v2');
 
 
-// AppNet.io module
-var AppNet = require('appnet.io').V2;
+// AppNet.link module
+var AppNet = require('appnet.link').V2;
 
 // Session establish protocol
 var SEP    = AppNet.SEP;

appnet.io-server.js renamed to appnet.link-server.js

@@ -1,13 +1,13 @@
-// AppNet.IO name-server implementation, that works with appnet.io name-client.
+// AppNet.IO name-server implementation, that works with appnet.link name-client.
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 //
 
 'use strict';
-var debug = require('debug')('appnet.io.srv');
+var debug = require('debug')('appnet.link.srv');
 
 
-// AppNet.io module
-var AppNet        = require('appnet.io');
+// AppNet.link module
+var AppNet        = require('appnet.link');
 
 // Session establish protocol
 var SEP           = AppNet.SEP;

apppkg

@@ -2,20 +2,20 @@
 
 # check docker image for packaging 
 if [ $# == 0 ]; then
-  echo "Build Docker image as appnet-srv:4.0"
-  docker image build --rm --network host --compress -t appnet-srv:4.0 -f ./Dockerfile.pkg .
+  echo "Build Docker image as appnet-srv:4.1"
+  docker image build --rm --network host --compress -t appnet-srv:4.1 -f ./Dockerfile.pkg .
 fi
 
-if [ "$(docker images -q appnet-srv:4.0 2> /dev/null)" == "" ]; then
-  echo "Build Docker image as appnet-srv:4.0"
-  docker image build --rm --network host --compress -t appnet-srv:4.0 -f ./Dockerfile.pkg .
+if [ "$(docker images -q appnet-srv:4.1 2> /dev/null)" == "" ]; then
+  echo "Build Docker image as appnet-srv:4.1"
+  docker image build --rm --network host --compress -t appnet-srv:4.1 -f ./Dockerfile.pkg .
 fi
 
 # execute commands 
 if [ $# -ne 0 ]; then
   echo "$@ ..."
-  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-srv:4.0 $@
+  docker run -v `pwd`:`pwd` -w `pwd` -i -t --rm --network host appnet-srv:4.1 $@
 else
   echo "Start services ..."
-  docker run --tmpfs /appins/httpp/certs-tmp -d --restart=on-failure --network host appnet-srv:4.0
+  docker run --tmpfs /appins/httpp/certs-tmp -d --restart=on-failure --network host appnet-srv:4.1
 fi

bin/srv-ip6.js

@@ -2,7 +2,7 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 //
 var fs    = require('fs');
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 
 // root CA
 var vCA = require('ssl-root-cas').create();

bin/srv-v2.js

@@ -2,7 +2,7 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 //
 var fs = require('fs');
-var nmSrv = require('../appnet.io-server-v2');
+var nmSrv = require('../appnet.link-server-v2');
 
 var nmsrvs = new nmSrv(
     // endpoint info

bin/srv.js

@@ -2,7 +2,7 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 //
 var fs    = require('fs');
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 
 // root CA
 var vCA = require('ssl-root-cas').create();

ca-certs/README.md

@@ -1,3 +1,3 @@
 ### SSL CA Certs
 
-* 2020.02.29, update CA cert for httpp.aiworkspace.com instead of iwebpp.com
+* 2020.02.29, update CA cert for httpp.appnet.link instead of iwebpp.com

demos/clnt.js

@@ -1,12 +1,12 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP = nmSrv.SEP;
 
 var dgram = require("dgram");
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntA-ip6.js

@@ -1,12 +1,12 @@
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
 // vURL
 var vURL = require('../vurl');
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntA.js

@@ -1,12 +1,12 @@
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
 // vURL
 var vURL = require('../vurl');
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntB-ip6.js

@@ -1,10 +1,10 @@
 var _     = require('lodash');
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntB.js

@@ -1,10 +1,10 @@
 var _     = require('lodash');
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntC-ip6.js

@@ -1,10 +1,10 @@
 var _     = require('lodash');
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/clntC.js

@@ -1,10 +1,10 @@
 var _     = require('lodash');
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

demos/dese.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var WEBPP = nmSrv.Client;
 var SEP   = nmSrv.SEP;
 

demos/fileshareA.js

@@ -1,11 +1,11 @@
 
-var nmSrv = require('../appnet.io-server');
+var nmSrv = require('../appnet.link-server');
 var nmCln = nmSrv.Client;
 var SEP = nmSrv.SEP;
 
 var dgram = require("dgram");
 
-// appnet.io-ws library
+// appnet.link-ws library
 var WebSocket = require('wspp').wspp;
 var WebSocketServer = WebSocket.Server;
 

index.js

@@ -1,8 +1,8 @@
-// AppNet.io controller 
+// AppNet.link controller 
 // Copyright (c) 2020 Tom Zhou<appnet.link@gmail.com>
 
 // default server v1
-module.exports    = require('./appnet.io-server');
+module.exports    = require('./appnet.link-server');
 
 // v2
-module.exports.v2 = require('./appnet.io-server-v2');
+module.exports.v2 = require('./appnet.link-server-v2');

package.json

@@ -1,8 +1,8 @@
 {
   "author": "Tom Zhou <appnet.link@gmail.com> (https://appnet.link)",
   "name": "appnet.link-controller",
-  "description": "AppNet.io protocol controller service for node.js",
-  "version": "4.1.0",
+  "description": "AppNet.link protocol controller service for node.js",
+  "version": "4.1.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/InstantWebP2P/appnet.link-controller.git"

tests/connection-v2.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 
-var SEP = require('appnet.io').SEP;
+var SEP = require('appnet.link').SEP;
 
 process.on('uncaughtException', function (err) {
   console.log('Caught exception: ' + err);

tests/connection.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 
-var SEP = require('appnet.io').SEP;
+var SEP = require('appnet.link').SEP;
 
 process.on('uncaughtException', function (err) {
   console.log('Caught exception: ' + err);

tests/punch_hole.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2012-present Tom Zhou<appnet.link@gmail.com>
 
-var SEP = require('appnet.io').SEP;
+var SEP = require('appnet.link').SEP;
 
 process.on('uncaughtException', function (err) {
   console.log('Caught exception: ' + err);

vurl.js

@@ -101,7 +101,7 @@ vURL.prototype.del = function(vurl, fn){
     }
 }
 
-// class methods MUST be compatible to AppNet.io
+// class methods MUST be compatible to AppNet.link
 
 // Version 1.0
 vURL.version = vURL.VERSION = '1.0';